Mailcap-fix

Fixed a unit test for 3.6, no change in functionality.

Stable release now that python 3.6 has included the patch.

- Updated to reflect the version of the patch that was merged into the python default branch.

- Fixed a README unicode error when loading into setup.py
- Fixed a typo in the README example
- Re-organized the test/benchmark files
- Changed the avaliable project imports to the following

python
from mailcap_fix import mailcap_fix
from mailcap_fix import mailcap same as mailcap_fix
from mailcap_fix import mailcap_original

- Added tests from the cpython test suite
- Removed lineno generator in favor of just incrementing the integer.