Color scheme changes; mostly for better colors in terminal rather than MacVim.
Merge branch 'master' of github.com:filthyrichard/dotvim