install vim-coffee-script
Merge branch 'master' of github.com:mathgl67/dotvim

Conflicts:
	.gitmodules