more 2.x work
mostly userlist.php
Work on getting the latest stuff from master merged and upgraded.