Merge branch 'develop'
Merge branch 'develop'
Add mercurial dependency for django-livesettings repo
Update README.md
Update README.md
Clarify the multi-org nature of econsensus, its default email behaviour, and how to start using it.
Merge branch 'develop'
deploy: remove references to project_root

and check for local changes in localfab deploy()
deploy: use local_vcs_root in project_settings

to avoid confusion in fablib.  Also add localhost as a deploy target.
deploy: if in active virtualenv, then use it
Merge branch 'master' into develop
Updated README with some notes on contributing - we want to avoid contributors working on master as this can cause conflicts
Merge branch 'master' into develop
Fixed duplicate h2 in organization add/edit form - the parent template
creates an h2 containing the text supplied in the 'title' django block
so we needn't define our own h2 in this template, just supply the
contents to the 'title' block.
Merged in pull request 121 from Philip to lock down org detail screen to
admins only -
https://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1388749
Merge branch 'develop' into dye

* develop:
  Merged in pull request 121 from Philip to lock down org detail screen to admins only - https://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1388749
  Fixed duplicate h2 in organization add/edit form - the parent template creates an h2 containing the text supplied in the 'title' django block so we needn't define our own h2 in this template, just supply the contents to the 'title' block.
  Updated README with some notes on contributing - we want to avoid contributors working on master as this can cause conflicts
  Clarify the multi-org nature of econsensus, its default email behaviour, and how to start using it.
  Update README.md
  Update README.md
  Add mercurial dependency for django-livesettings repo