Switch to NSUInteger so as to accommodate both option types
Use the more appropriate NS_OPTIONS for CK2DirectoryEnumerationOptions
Merge branch 'v2.x-beta' into ck2openpanel