devise whitelist
merge fix
Merge pull request #35 from slwaller/master

devise whitelist