Vim bundles
Conflict resolution
Merge branch 'master' of github.com:rm-hull/dotfiles

* 'master' of github.com:rm-hull/dotfiles:
  Vim bundles
  Handle .asm files as NASM
  Updated versions
  Vim bundles
  Vim bundles
Merged