updated .gitignore to catch *.un~; changed model to avoid reserved field label