Keepass2 also has a "synchronize" feature that can merge edits made in memory to a stored file on disk; just throw your keys into dropbox, and when you need to change anything just hit "synchronize with file" and it will merge your keys. Works great.