jdoc changes
Merge branch 'master' of https://github.com/thlgrant/node-angular-kickstarter