twitter search/persist complete
Merge branch 'master' of github.com:richessler/map_hash

Conflicts:
	app/controllers/tweets_controller.rb
	app/views/tweets/index.html
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid