Update gitignore
Merge branch 'master' of github.com:athal7/dotfiles
Change to xterm for term colors