Merged from Master and adding Flask-Test and SQLAchemy back onto requirments.txt