Make all non-dashed keys into keys
Merge branch 'master' of github.com:systemed/iD