My bad: six is only needed for testing
Simplify packaging
Remember to update console_scripts for the simplified packaging