Update makefile paths
Update color scheme
Merge branch 'master' of github.com:crosbymichael/.dotfiles