Conflict resolution
Use requests for all remaining urllib calls
Align exception logic correctly
Whitespace fixes for PEP8
Merge remote-tracking branch 'origin/beta3' into requests