Tests for oauth library (100% line coverage)
Merge pull request #61 from penzance/feature/oauth_tests

Tests for oauth library
Merge pull request #63 from penzance/feature/mutli_exp_part1.5

adds html for creating and editing experiments
Merge branch 'feature/mutli_exp_part2' into develop
Merge branch 'master' into develop

Conflicts:
	ab_tool/urls.py
Updates install documentation and fixes two parts of config
adds model to admin
Merge branch 'feature/multiple_experiments' into develop
Merge pull request #68 from penzance/feature/docs_update

feature/docs_update
suggestd pull request changes
Merge branch 'develop' into feature/additional_tests