Users

hey!  we added some awesome features to your users, and now we think you should merge them with master.  (just in time for payday!)