In which we improve our testing

[larsks]

This is a series of small changes intended to introduce some additional tests and to make our tests more useful. The major changes are:

• Check that {test-,}requirements.txt are sorted
• Check for conflict markers
• Make pep8 checks usable as git pre-commit hooks
• Add some example hook scripts