Improved fix for any option
Fixed failing FacetFilterResults tests
Made tests test changed functionality
Merge branch 'master' of https://github.com/openhatch/oh-mainline
Merge branch 'master' of https://github.com/openhatch/oh-mainline

Conflicts:
	mysite/search/view_helpers.py
Merge branch 'master' of https://github.com/openhatch/oh-mainline
Added .coveragerc
Merge pull request #143 from Aaron1011/add_coveragerc

Added .coveragerc
Added build status image to README
Merge pull request #144 from Aaron1011/build_status

Added build status image to README
Added coverage image
Merge pull request #145 from Aaron1011/coverage_badge

Added coverage image
Merge branch 'master' of https://github.com/openhatch/oh-mainline