first round of updates
Merge branch 'master' of https://github.com/andrewdamelio/MEAN-Skeleton

Conflicts:
	README.md