upgrade to handle more advanced solr features
Merge branch '204'

Conflicts:
	haystack/backends/solr_backend.py