Squashed commit of the following:
commit 2f3bc6d4829c0f6f901ed2185a2e05f31d1be79f
Author: Adam Coddington <me@adamcoddington.net>
Date: Sat Jan 23 14:58:44 2016 -0800
Most modern tools have dropped support for Python 2.6 at this point; we should, too.