Merge remote-tracking branch 'upstream/master'

https://github.com/simonowendesign/dotfiles.git is upstream