Recompiling assets for heroku, moving maps.js back into root.
Merge branch 'master' of https://github.com/astuyve/TwitterThing

Conflicts:
	app/controllers/search_controller.rb
	app/views/search/timeline.html.erb
	public/assets/manifest-61d4a56260f74ac9f31d5e0b278fa75b.json