add apt-get repository for vim 7.4
edit coffee
Merge branch 'hotfix/include_coffeescript' into develop

* hotfix/include_coffeescript:
  edit coffee
  add apt-get repository for vim 7.4
  add twitter-bootstrap-rails gem
Merge branch 'release/1.4'

* release/1.4:
  edit coffee
  add apt-get repository for vim 7.4

Conflicts:
	app/assets/javascripts/application.js