Switch to our branch for multiple ssh keys

I have fixed a bug with the feature branch as it stood and added a test
for the new functionality. I have pull requested this back to thier
master and will change this when it has been merged and released.