Changes from my linux ude, ubuntu
Merge branch 'master' of github.com:michaelghinrichs/.dotfiles