additional tests
Merge branch 'master' into feature/additional_tests

Conflicts:
	ab_tool/exceptions.py
	ab_tool/templates/ab_tool/control_panel.html
	ab_tool/urls.py
	ab_tool/views/main_pages.py
merge with master resolved; edits to models; download data changes propogated
Merge branch 'feature/multiple_experiments' into feature/additional_tests
Merge branch 'feature/multiple_experiments' into feature/additional_tests
more tests for download_deployments
additional experiment tests
additional tests for deploy_intervention_point
additional tests for controllers, common methods
Merge branch 'develop' into feature/additional_tests
Reverts changes to be split into feature/additional_tests_part2
Revert "Reverts changes to be split into feature/additional_tests_part2"

This reverts commit 1a7341eb4d47db8d5096a95c6c57acc2862791bb.
Merge branch 'develop' into feature/additional_tests
Merge branch 'develop' into feature/additional_tests_part2
Merge branch 'feature/additional_tests' into feature/additional_tests_part2
Merge pull request #69 from penzance/feature/additional_tests

Feature/additional tests
Merge branch 'feature/additional_tests_part2' into develop
Clean-up codebase; addresses pull request #70 feature/additional_tests_part2 suggestions
Merge branch 'develop' into feature/addresses_small_items

Conflicts:
	ab_tool/urls.py