Merge branch 'develop' into colander
None of this is working, do not merge
Reverted some changes, test framework solid
merged develop in colander branch
got app.js from develop branch
Removed testing.ini, added testing.ini.example, added requirements, default nose options added, moved tests.py and added example test in base.py
removed models.py so that it matches develop branch
Merge branch 'add_better_test_framework' into develop