Better naming for the private overridable methods.
Enable deprecation warnings in tests in Python 2.7.

This also revealed a deprecated call to cgi.parse_qsl.
Fix line endings
Merge pull request 28