Deploy: More progress with Messages
Merge branch 'master' of git://github.com/nursix/eden
Merge work branch, cleanup.