Changes from PatL
Merge branch 'master' of https://github.com/justyns/jdotfiles