some changes
Merge branch 'master' of github.com:benekastah/osx-bootstrap
Config updates from work MBP
Merge branch 'master' of github.com:benekastah/osx-bootstrap