Merged with work computer
Merge branch 'master' of https://github.com/zejedi/dot-files