Merging everything
Merge fix
Merge branch 'master' of https://github.com/emrysgraefe/POD

Conflicts:
	app/views/searches/_search.html.erb
Merge fix hopefully