updates from lodgistics
Merge branch 'master' of https://github.com/gduquesnay/dotfiles