Code cleanup
Merge branch 'master' of https://github.com/IanBullard/BinaryOBJ

Conflicts:

BinaryObjTool/BinaryObjTool.xcodeproj/project.xcworkspace/xcuserdata/ibu
llard.xcuserdatad/UserInterfaceState.xcuserstate