Updated color schemes and stuff
Added file settings
Merge branch 'master' of github.com:rschmukler/dotfiles
Updated plugins