Remove xrange for Py3 compatibility
Using update() to merge dictionaries

Doing this for Py3 compatibility, since you can no longer do
dict1.items() + dict2.items() because they return views.
Fixing url parser compatibility for Py2/Py3
Add api_v3 branch to Travis builds