Merge pull request #96 from ragingscholar/master

Use urlparse instead of urllib.parse for python2.7

mastodon/Mastodon.py

@@ -16,7 +16,10 @@ import dateutil.parser
 import re
 import copy
 import threading
+try:
     from urllib.parse import urlparse
+except ImportError:
+     from urlparse import urlparse
 
 
 class Mastodon: