* Rabased pull/489/head (@allanbank) to master
* Backed out unnecessary line breaks for 120 char limit
* Enforced checkstyle on new code
  * Was required to make db variable private, updated in tests
  * Removed TODO

Closes #489