Renamed properties to be clearer

Updated tests to be latch based instead of time based.  This makes the
tests cleaner without race conditions on slow systems.

USERGRID-753
Merge pull request #59 from apigee/USERGRID-753

Renamed properties to be clearer
Merge branch 'master' into USERGRID-1185
Fixes issue with loading incorrect entity types on collection load.

USERGRID-1185