Merge branch 'master' of https://github.com/yeoman/generator-angular

* 'master' of https://github.com/yeoman/generator-angular:
  fix(app): copy glyphicons for sass
  chore(deps): update grunt-conventional-changelog to v1.0.0
  fix(docs): fix section explaining generating services
  fix(docs): Add explicit instructions for installing yo
  feat(app): generate Travis config
  feat(app): use checkboxes for module selection
  feat(app): add jshintrc for testing folder
  fix(app): add jQuery <script> into index.html template
Merge branch 'master' of https://github.com/eddiemonge/generator-angular

* 'master' of https://github.com/eddiemonge/generator-angular:
Merge branch 'jade_support' of https://github.com/eddiemonge/generator-angular into jade_support

* 'jade_support' of https://github.com/eddiemonge/generator-angular:
  jade in the files
more changes
more