Adding basic map search functionality.
Merge branch 'twitter_bootstrap' of https://github.com/evanwieren/unitedwayaws2013 into twitter_bootstrap

Conflicts:
	app/controllers/search_controller.rb
	app/views/search/index.html.erb
	config/routes.rb
merging map views
change to _key
Merge branch 'master' of github.com:evanwieren/unitedwayaws2013
Maps search button
Master merged
Gemfile chages?
Fixing the locations search.
Adding popups for the search results.
Adding example descriptions.
wip, search
Merge remote-tracking branch 'origin/master' into search

Conflicts:
	app/controllers/search_controller.rb
Merge pull request #3 from Tobscher/search

Search
Facebook posting
Merge remote-tracking branch 'origin/master' into mongoid

Conflicts:
	Gemfile.lock
	app/models/need.rb