squash git warnings
colors in vim
Removed some unused functions
Merge branch 'master' of github.com:rjshade/dotfiles