Allow searching by username
Remove token tests.
They don't currently pass when run against live. We can add them back in later.
Merge branch 'richsage-remove-token-tests'
removing un-needed join and updating to include the totals calculation for the collection
Merge branch 'akrabat-user-search'