Tweak paths etc.
Merge branch 'master' of https://github.com/idearat/dotfiles