merging jrollins and micah work, reverting ui changes for m-h gen-key and import-key