Pre-merge commit
Merge branch 'v2' of https://github.com/firebase/geoFire into v2
Got tests passing again. Commented out a few lines though which need to go back in.