Added guard around inclusion of ORM caching. A couple of formatting fixes.
Fixed merge problem around use of ORM caching.
Made database selection code more robust. Fixed wording.
Improved handling of CCJ_PRODUCTION environment variable and a small refactoring.
Merge pull request #101 from nwinklareth/master

Extended environment variable runtime configuration control