Yikes, big PR..

Not an ideal way of doing things but here it is..

* Full refactor
* Migration to Socket 1+
* Drop db clean up ops
* Fix all tests and language/strings
* Clean up settings file

Full days work to get back on top of things, still a lot to do but much easier to work on now.