Updated: Search template with clearer instructions

For the sake of demonstration.
Merge branch 'master' of git://github.com/ELVIS-Project/elvis-site
Merge branch 'master' of git://github.com/ELVIS-Project/elvis-site
Fixed: Searching With Special Characters

Fixes #28... strangely the Latin factory works on my local machine, but not on the development server. I've only used the ascii folding factory here.
The change in solrsearch.py was unintuitive, but it seems like python got confused when joining strings with special characters.
Updated: Minor changes to templates, merge with devel server

Some slight tweaks made to the templates after merge.
Updated: Small Changes to Models & Helpers for merge

Resolved conflicts between devel and my machine from previous commits.
Merge branch 'master' of git://github.com/ELVIS-Project/elvis-site

Conflicts:
	elvis/elvis/helpers/solrsearch.py
	elvis/elvis/templates/base.html
	elvis/elvis/templates/search/search.html
	elvis/elvis/templates/search/search_results.html