Changed things
Changed some more things
Merge branch 'master' of https://github.com/Willifme/dot-files