Fixed key conflict for map to user feature
Facebook api querying now uses new where model
Added NAME to resampled_location so it can be run by celery