Clean up and reshuffling of some unused configuration options.
Merge branch 'rails3' of github.com:myGrid/biocatalogue into rails3