Server update
Small tweaks

- Updated Where db logging takes place.

- Tidied up areas of code that duplicated code.

- Minor other stuff
Merge branch 'master' of https://github.com/MyHatIsAwesome/hackmanchester2013