Nickyt bugs

This fixes issue #121.

All commits except, https://github.com/pushpickup/pushpickup/commit/26cf8f77d16f731351a628c64310b7da800002b3, are in the devel branch already.

I've tested locally and all is good. First check-in was awkward. Let's see how the first pull request goes ;)