WIP: no idea if the new user stuff works for Steve
Merge branch 'master' of github.com:spf13/kaiju
Merge branch 'master' of github.com:spf13/kaiju