Latest commit 8f29607 Oct 29, 2015 @tow Merge branch 'extra_options' of https://github.com/aptivate/sunburnt
…into aptivate-extra_options

Conflicts:
	sunburnt/search.py