Ignore xccheckout
Cleanup

* Remove #define's
* sort methods
* consistent #pragma mark -
Minor README edits

Remove some self deprecation
Merge branch 'cleanup'