Move GUI-only colorscheme setting to gvimrc
Don't try to load todo.txt
Set git editor to correct path to vim
Merge branch 'master' of github.com:smt/dotfiles

* 'master' of github.com:smt/dotfiles:
  Vim plugin updates
Vim plugin update
oh-my-zsh update