Express v4.x
correct path to views
Fixed issues with Express 4.0 integration
Merge branch 'pr/130'

Conflicts:
	templates/express/config/express.js
Merge branch 'master' of github.com:DaftMonk/generator-angular-fullstack
Added missing dependency to package.json
Cleaned up accidental line breaks
Updated heroku deployment instructions
Merge branch 'master' of github.com:DaftMonk/generator-angular-fullstack
Made deployment generators use url friendly names for deployment