merging oddities
Merge branch 'master' of https://github.com/hspasta/dotfiles

* 'master' of https://github.com/hspasta/dotfiles:
  new vim molokai colorscheme