Merge pull request #3 from hillegass/bmonk-changes

Bill Monk changes from 2011-2012
Fixes to make the ever-more pedantic Xcode happy
Fixes to make the ever-more pedantic Xcode happy
More pedantic Xcode 5 changes...