Match chrislopresto manifest-ness to dliggat's for troubleshooting
Merge branch 'mavericks3' of github.com:plyfe/our-boxen into mavericks3