Bring back lock-out feature.
Add 12-Factor gem.
Merge branch 'development'