update master
set up options to customize devise
Merge branch 'user-auth-with-devise'
fix http_basic so it plays nice with devise