Edit configuration.rst to reflect current divcontrol.txt
More configuration.rst edits
Merge branch 'master' of https://github.com/macroevolution/bamm