Add roles

@feanil I'm hopeful this will fix the Mongo issues that @wedaly was seeing, see hipchat.  Will try to test from here and see how it goes.
This is missing the user creation stuff in #1701 from line 54 down.