Development hours users

Merging in users changes and namespace stuff.  There's some events info in here, but it is not completely done.  Because of the nature of the changes and the fact that Kyle is starting to work on this, I want to get this merged in now.