wip
Merge branch 'master' of github.com:binarylogic/authlogic
merge pulls