Some half-baked features
Merge branches
Finish switching stylesheets
Allow admins to change passwords
Change 'Inbox' to 'Messages'