Disallow requests 2.4.0 in requirements. fixes #2690, #2684
Make errors from search plugins in discover log to error log
Set different user agent in torrentz plugin. fix #2677, #2678
Improve error messages for torrentz search
Actually set different user agent in torrentz plugin
Fix api_tvdb on python 2.6. fix #2695
Clarify bootstrap.py requirements in readme a bit.
Relax pushover url validation so that jinja works properly.
Fix plex plugin error introduced a few versions ago. refs #2697
Revert "Enable sqlite WAL to try to solve database locked problems."
refs #2699
This reverts commit e2c118e32866605abb96bafd5dd7a5f0d1e53863.
Try switching to NullPool to solve database locked issues. refs #2360, #2686
Catch timeouts in form login plugin. fix #2700
Revert "Try switching to NullPool to solve database locked issues. refs #2360, #2686"

This reverts commit 756e05d4c1215a6e3785cbde2df8c64998732ae0.
Fix column type for storing schedule trigger ids.
Merge branch 'develop' into guessit

Conflicts:
	pavement.py
Make the parsers verbose
Fix custom parser configuration