Added method so you can now search by email and username.  This commit also includes several bug fixes...