Fixing more CAPS problems and code style violations.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Fixing code style violations.