JSONKit update, fixes more Xcode warnings
SFHFKeychainUtils isn't used anymore (using SimpleKeychain)
Internal tidy ups, code modernisation