Finish moving things to the service.

- notification re-launches activity
- add ability to disconnect
- misc cleanup