added version 3 of python to tests

changes for python 3 support

changed the import for urlencode to work on python 2 and 3
Merge branch 'master' of https://github.com/mockersf/browsermob-proxy-py