Gave some more sane defaults and upped the minimum password size
Merge remote-tracking branch 'origin/master'