Small fixes, mostly cleaning
Merge branch 'master' of https://github.com/TheRedMood/dotfiles