cleaned up user.class.php
Merge branch 'Testing' of https://github.com/BlueVM/Feathur into Testing