Working through bugs and router logic
Merge remote-tracking branch 'origin' into feature-datefilter
Fixed router logic to wait for user and other subscriptions before rendering
Fix some of the broken things
checking for users pins to be there.
Variable naming
Merge remote-tracking branch 'origin/master' into feature-datefilter

Conflicts:
	client/views/map/filters.coffee
Fix filters
Merge remote-tracking branch 'origin/master' into feature-datefilter