Minor clean up
Add a --rekey option
Bump version a bit