Pass kwargs through to _user_is_active_or_staff
Merge remote-tracking branch 'upstream/master'
Merge pull request #34 from cam-stitt/master

Add kwargs to _user_is_active_or_staff