Finished updating requirements for virtualenv
Fixed setup.py
Documentation
Updated version number
Merge branch 'release/0.2.1'