SourceMaps Support?

I've got the demo up and running for generating the sample-library and linked into an angular-cli app and can't get source mapping at all.

Steps
mkdir new-toolbar
cd new-toolbar
yo angular2-library
npm run build
cd dist
npm link
cd ../../new-app
npm link new-toolbar
ng serve --preserve-symlinks (angular-cli based)
App Runs. Open Chrome Debugger -> Ctrl+0 SampleCompnent I only get the option of SampleComponent.ngfactory.ts which is really difficult to debug.

Also I have to use ng serve --preserve link to get the angular-cli app to run. This has the sad by-product of not allowing npm run build:watch in the component to affect the main app with updates.

Thoughts / Help?