Makefile love.
Upgrade to six 1.8 for a friendly `with_metaclass()`.
version bump for 0.80.5.
Merge branch 'release/0.80.5' into develop