half cleaned up
Merge branch 'master' of github.com:jhstatewide/nobrainer

Conflicts:
	lib/no_brainer/criteria/nearest.rb
	lib/no_brainer/document/types/geo_point.rb