remove JSONKit and replace with NSJSONSerialization
fix up build settings for ios7
Update Makefile to run tests correctly for new xcode
revert Makefile to old xcode format until travis upgrades, but still specify arch, see if that clears things up
fix problem with mutable
make sure to include arm64 slice in universal binary, fix up compiler warnings from log statements
no arm64 slice in tests
travis supports iOS 7 now
Merge branch 'nsjson'

Conflicts:
	KeenClient/KeenClient.m
bump to 3.2.2