Merge remote-tracking branch 'origin/master'

# Conflicts:
#	optional-requirements.txt

optional-requirements.txt

@@ -11,24 +11,13 @@ PyDrive==1.3.1
 PyYAML==3.12
 rsa==3.4.2
 six==1.10.0
-
 # goodreads
 goodreads>=0.3.2
 python-Levenshtein>=0.12.0
-
-# ldap login
-python_ldap>=3.0.0
-flask-simpleldap>=1.2.0
-
-# extracting metadata
+#extracting metadata
 lxml>=3.8.0
 Pillow>=4.0.0
 rarfile>=2.7
-
 # other
 natsort>=2.2.0
-git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi
-
-# Oauth Login
-flask-dance>=0.13.0
-sqlalchemy_utils>=0.33.5
+git+https://github.com/OzzieIsaacs/comicapi/archive/5346716578b2843f54d522f44d01bc8d25001d24.zip#egg=comicapi