some updates from work
Merge branch 'master' of https://github.com/libjack/dotfiles