Added ability to change keylength. See #25
Minor changes
Untracking incomplete upgrade script