Merge branch 'master' of https://github.com/mschae/dotfiles
Multiple changes