Implement ability to add keystore, as per 	jcaraballo's pull request