Fix delete keypair if in use
Merge branch 'manuelmazzuola-master'

* manuelmazzuola-master:
  Fix delete keypair if in use

Conflicts:
	src/main/java/grkvlt/Ec2CleanUp.java