Fix up the README and TODO
Merge branch 'devel' of github.com:imaginaryirc/services into devel