Merge branch 'master' of https://github.com/rm-hull/dotfiles

* 'master' of https://github.com/rm-hull/dotfiles:
  Update various vim bundles
  Add vim syntax file for prolog files
  Added SBT for scala projects
Removed scala vim files, replaced with vim-scala bundle