added some color stuff for trailing whitespace
Merge branch 'master' of https://github.com/johnnygaffey/dotfiles