Merged from trunk. Note that there was some manual editing to templates and to settings.py. The change from r189-190 was manually added to harvest/templates/opportunities/results.html and harvest/templates/opportunities/results_pkgdetails.html; the templates originally changed no longer exist here.