Install vim coffee-script bundle
Merge branch 'master' of github.com:pelletier/dotfiles

Conflicts:
	.bash_profile
	.gitmodules