Upgrade vim bundles
Remove snipmate from gitmodules
Install vim snippets bundle
Open quickfix window after grep commands
Upgrade vim-scala
New scala syntax
Speed up keyboard
Merge remote-tracking branch 'origin/master' into macosx

Conflicts:
	vim/ftplugin/scala.vim