Merge branch 'add_better_test_framework' into develop
Added Running tests section to README.txt
Merge branch 'add_better_test_framework' into develop
Merge branch 'develop' into colander