Merge driver for encrypted repo

Now you can merge and resolve conflicts in encrypted repos
Merge branch 'sshencryption'

Conflicts:
	gitcrypt-merge