Cleanup and more API work
Merge branch 'master' of https://github.com/essentials/Essentials