Customized vim colors and added a few settings
Updated templates
Merge branch 'master' of github.com:jasonbcox/dotfiles