colors and updates
Merge branch 'master' of github.com:mikker/dotfiles