Added coffeescript and Haskell vim highlighting
Merge branch 'master' of https://github.com/dolor/dotfiles

Conflicts:
	home/.vim/bundle/vim-coffee-script
Added vim coffeescript highlighting