A large pile of work;
- General cleanups
- Nick Registry API and handler
Merge master from Github