Merge pull request #492 from nomis52/master

Switch to the generic RpcServer, closes #259.
Merge pull request #494 from nomis52/master

Document and cleanup code in /olad
Remove unused includes.