More CoffeeScript keywords
Merge branch 'master' of https://github.com/roshambo/vim-venders

Conflicts:
	syntax/coffee.vim
Resolve erge conflict