color scheme changes, vim updates
Merge branch 'master' of https://github.com/bubylou/dotfiles