Updated with new user & group framework
0.19.0
Merge branch 'master' of https://github.com/TheMuses/achilles