Changed enums to use NS_ENUM or NS_OPTIONS macros. closes #382
Merge pull request #383 from pbendersky/nsenum

Changed enums to use NS_ENUM or NS_OPTIONS macros. closes #382