Some good fixes here
Merge branch 'master' of https://github.com/allevaton/dotfiles into pull