Issue #181: Adding Unit Test
Merge remote-tracking branch 'origin/develop' into index-reconciliation

Conflicts:
	SimperiumTests/XCTestCase+Simperium.h