Added not flagged filtering on the view.
Merge remote-tracking branch 'carsonblack/7.x-1.x' into 7.x-1.x

Conflicts:
	docroot/sites/all/modules/features/rider_locations/rider_locations.views_default.inc
Merge remote-tracking branch 'bryanhirsch/7.x-1.x' into 7.x-1.x