latest updates from work mac
Merge branch 'master' of github.com:ninjabiscuit/dotfiles