Added better support for Python2

- Attempt to detect what version of the Urllib API is being used.
Merge branch 'develop'