email-addr-remap.sh - keep previous names, add new ones

allows the mapping to be built incrementally
  but you still have a broken import each time a user is missing
cvs2git.options.template - we don't want to commit the userlist

in email-addr-remap.sh build the file from template
make the template from the previously-commited copy, minus our user list