updates from paul.chartio.org
Merge branch 'master' of github.com:benekastah/osx-bootstrap