some stuff from work
Merge branch 'master' of github.com:vforgione/dotfiles