Reversed order of last 2 password options.

It's rather strange to have an item coming after 'Do none of the above
...'.
Release v0.3.1
Added tag v0.3.1 for changeset 8a22eea3a382
Merge 0.3.x to master
update version to 0.4.pre for master