MBP changes
Merge branch 'master' of github.com:davetcoleman/unix_settings