Make dsmail always retain default fields

dsmail should always retain the "default" fields, because it is
2013 and disk is cheap (Trac: #1114)
Add the "-x" option to _not_ retain the default fields, and
change the options to not be toggles
Merge branch 'master' of git+ssh://git.mit.edu/git/athena/discuss