Lots of changes from the MBPro.
Merge branch 'master' of https://github.com/efferencecopy/codebase