stopped the map zooming on maouse scroll.
Merge branch 'master' of https://github.com/michballard/fhellow
fixed merge conflicts in spec/features/user_summaries_feature_spec.rb

Conflicts:
	spec/features/user_summaries_feature_spec.rb
Merge branch 'master' of https://github.com/michballard/fhellow
fixed conflicts in spec/features/user_summaries_feature_spec.rb