Merge pull request #35 from slwaller/master

devise whitelist