Readme updates

npm package configuration
Merge branch 'master' of https://github.com/liquidcowgithub/gulp-ng-scaffold

Conflicts:
	README.md
	package.json
-merge fixes