Standardise file names and remove unnecessary $db_oc and $db
Bring code into line with coding style guidelines
Merge pull request #506 from timschofield/develop

Develop