Merge branch 'jdavis_master' into script
Merge branch 'script' of github.com:jdavis/twofactorauth into script