added colortheme, edit commit author
Merge branch 'master' of github.com:SMWTLM/dotfiles