Change requirements for Python 3 compatibility

Remove wsgiref (not compatible, not required)
Change Flask-and-Redis in favour of Flask-Redis (latter is compatible)
Use forked version of Flask-WhooshAlchemy that has full Python 3 compatibility

requirements.txt

@@ -1,5 +1,4 @@
 Flask==0.10.1
-Flask-And-Redis==0.5
 Flask-Cache==0.13.1
 Flask-DebugToolbar==0.9.0
 Flask-Login==0.2.11
@@ -10,7 +9,6 @@ Flask-SQLAlchemy==2.0
 Flask-Script==2.0.5
 Flask-Themes2==0.1.3
 Flask-WTF==0.10.2
-Flask-WhooshAlchemy==0.56
 Jinja2==2.7.3
 Mako==1.0.0
 MarkupSafe==0.23
@@ -30,7 +28,6 @@ pytest-cov==1.8.0
 pytest-random==0.02
 redis==2.10.3
 simplejson==3.6.4
-wsgiref==0.1.2
-
+flask-redis==0.0.6
 https://github.com/frol/postmarkup/tarball/master#egg=postmarkup
-
+https://github.com/jshipley/Flask-WhooshAlchemy/archive/master.zip#egg=Flask-Whooshalchemy

setup.py

@@ -40,7 +40,7 @@ setup(
     platforms='any',
     install_requires=[
         'Flask',
-        'Flask-And-Redis',
+        'Flask-Redis',
         'Flask-Cache',
         'Flask-DebugToolbar',
         'Flask-Login',
@@ -72,7 +72,8 @@ setup(
         'postmarkup'
     ],
     dependency_links=[
-        'https://github.com/frol/postmarkup/tarball/master#egg=postmarkup'
+        'https://github.com/frol/postmarkup/tarball/master#egg=postmarkup',
+        'https://github.com/jshipley/Flask-WhooshAlchemy/archive/master.zip#egg=Flask-WhooshAlchemy'
     ],
     classifiers=[
         'Development Status :: 4 - Beta',