now I'll actuially be able to scp... Thanks Jim
Merge branch 'master' of github.com:aeakett/dotfiles

* 'master' of github.com:aeakett/dotfiles:
  use personal copy of vim if available
  one more try at adding vim powerline and solarized colours
  trying to clean up this vim bundle submodule mess I've made
  add givedef()