diff --git a/.gitignore b/.gitignore
index daf2545..23d1773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,27 @@
-.DS_Store
-*.pyc
+*.py[co]
+
+# Packages
 *.egg
 *.egg-info
-.project
-.pydevproject
-.settings
 dist
+*build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
diff --git a/.travis.yml b/.travis.yml
index 37907ff..472865e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,14 @@
 language: python
 
 python:
-  - 2.5
-  - 2.6
-  - 2.7
+  - "2.5"
+  - "2.6"
+  - "2.7"
 
-install: 
-  - pip install -r requirements.txt --use-mirrors
-  - pip install . --use-mirrors
+install:
+  - pip install . --quiet --use-mirrors
+  - pip install nose Flask-SQLAlchemy Flask-MongoEngine py-bcrypt --quiet --use-mirrors
+  - "if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then pip install importlib --quiet --use-mirrors; fi"
 
 before_script:
   - mysql -e 'create database flask_security_test;'
diff --git a/README.rst b/README.rst
index 627b0e8..12151e5 100644
--- a/README.rst
+++ b/README.rst
@@ -1,11 +1,7 @@
 Flask-Security
-===========
+==============
 
-|build status|_
-
-.. |build status| image:: https://secure.travis-ci.org/mattupstate/flask-security.png?branch=develop
-   :alt: Build Status
-.. _build status: http://travis-ci.org/mattupstate/flask-security
+.. image:: https://secure.travis-ci.org/mattupstate/flask-security.png?branch=develop
 
 Simple security for Flask applications combining Flask-Login, Flask-Principal, 
 Flask-WTF, passlib, and your choice of datastore. Currently SQLAlchemy via 
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 3794005..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Flask==0.8
-Flask-Login==0.1.3
-Flask-Mail==0.6.1
-Flask-Principal==0.2
-Flask-SQLAlchemy==0.15
-Flask-Script==0.3.2
-Flask-WTF==0.5.4
-Jinja2==2.6
-MySQL-python==1.2.3
-PyYAML==3.10
-Pygments==1.5
-SQLAlchemy==0.7.8
-Sphinx==1.1.3
-WTForms==1.0.1
-Werkzeug==0.8.3
-argparse==1.2.1
-blinker==1.2
-chardet==1.0.1
-docutils==0.9.1
-flask-mongoengine==0.3
-lamson==1.1
-lockfile==0.9.1
-mock==0.8.0
-mongoengine==0.6.12
-nose==1.1.2
-passlib==1.5.3
-pymongo==2.2
-python-daemon==1.6
-wsgiref==0.1.2
diff --git a/setup.py b/setup.py
index 0dfd608..e4d9ad6 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,8 @@ via Flask-Login, Flask-Principal, Flask-WTF, and passlib.
 Links
 `````
 
+* `documentation <http://packages.python.org/Flask-Security/>`_
+* `source <https://github.com/mattupstate/flask-security>`_
 * `development version
   <https://github.com/mattupstate/flask-security/raw/develop#egg=Flask-Security-dev>`_
 
@@ -32,11 +34,11 @@ setup(
     platforms='any',
     install_requires=[
         'Flask>=0.8',
-        'Flask-Login==0.1.3',
-        'Flask-Principal==0.2',
-        'Flask-WTF==0.5.4',
-        'Flask-Mail==0.6.1',
-        'passlib==1.5.3'
+        'Flask-Login>=0.1.3',
+        'Flask-Principal>=0.3',
+        'Flask-WTF>=0.5.4',
+        'Flask-Mail>=0.6.1',
+        'passlib>=1.5.3'
     ],
     test_suite='nose.collector',
     tests_require=[
diff --git a/tests/functional_tests.py b/tests/functional_tests.py
index 0905faf..b3100ab 100644
--- a/tests/functional_tests.py
+++ b/tests/functional_tests.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import with_statement
+
 from datetime import datetime, timedelta
 
 from flask.ext.security.utils import capture_registrations, \