Improved various haml views. Admins can now update users without needing to know their passwords
Resolved merge conflicts