Issues #41 and #43

This implements issues #41 (change default key length to 2048 bits) and #43 (fix button text when setting expiration to "none"). Is it bad practice to fix multiple issues on one pull request?