update config
Merge branch 'add-osx-defaults' of https://github.com/thegarage/osx-bootstrap into add-osx-defaults