adding an option to sepcify authorized_keys file
query the KeyModel to determine whether to removeKeyOnExit, rather than passing another parameter around
manual merge
remove references to removeKeyOnExit (this is determined by looking at the KeyModel to see if its a temporary key)