updated for colors and golint
Merge branch 'master' of github.com:vastbinderj/dotfiles