Merge pull request #417 from uberspot/master

Make email address less restrictive and fix double user ids
Fix export for new unified key list #409