Merge pull request #58 from wardi/master

add 'key's to metadata schema field choices
fix loading extras back into edit form