vim-coffee-script installed
Merge branch 'master' of https://github.com/amit1952/dotvim

Conflicts:
	bundle/vim-coffee-script