Added color to default
Merge branch 'master' of github.com:nhhagen/dotfiles