Feature/multiple ssh keys

This pull request (on a pull request) does:
- Fix merging of defaults
- Allow key names to be unique within a user rather than unique globally