Codesniff cleanup for user model
Merge branch 'master' into cs_user_model
Merge remote-tracking branch 'dstockto/cs_user_model'