regarde:less uses parallel:less
Update grunt-express-server
Update grunt-angular-templates
Use ng-app instead of angular.bootstrap

Closes #99
Update bower components
Update package.json dependencies
Update bower, npm packages, and switch to grunt-contrib-watch
Test Heroku again
Typo
Attempt to get nodejitsu working
e2e test should build first
Merge branch 'master' into feature/coffeescript

Conflicts:
	Gruntfile.coffee
	package.json