Reorg, again
Merge branch 'master' of github.com:kickyourapp/KYA-Guice-MVC