Fixed signin/signout and made everything less meaty, colorwise
Tidied up add/remove users in users module
Added rudimentary removeTestUsers