Add vim-javascript for better coffeescript highlighting
Merge branch 'master' of github.com:zorab47/dotfiles

Conflicts:
	.gitmodules