Sunspot 2.1.1 update in prep for new solr servers - I hope
Merge branch 'master' into sunspot_update
Merge pull request #240 from extension/sunspot_update

Sunspot update