neomutt updates

Cleaned up some more conflicts

neomutt/mailcap

@@ -25,3 +25,4 @@ text/vcard;                 mutt_vcard_filter; copiousoutput
 text/x-diff;                view %s; needsterminal
 
 text/x-patch;               view %s; needsterminal
+application/zip;	    unzip -c %s; copiousoutput; nametemplate=%s.zip

neomutt/neomuttrc

@@ -4,7 +4,7 @@ set from="orien@misfit.rodeo"
 set use_from = yes
 set envelope_from = yes
 
-set hostname=utage.i.misfit.rodeo                   # Name of the localhost
+set hostname=home.icebergh.us                       # Name of the localhost
 set hidden_host                                     # Hide host details
 set alias_file=~/.config/neomutt/aliases            # Personal mail aliases
 #set query_command="~/bin/mutt-ldap '%s'"           # How to query the company contacts

neomutt/save-hooks

@@ -11,3 +11,5 @@ save-hook '=f @rtx.com' "=Customers/RTX"
 save-hook '=f @shu.edu' "=Customers/SHU"
 save-hook '=f @partner.paloaltonetworks.com' "=Partners/PaloAlto"
 save-hook '.*' "=[Gmail]/All Mail"
+#save-hook .* =Archive/`date "+%Y-%m"`
+#save-hook .* "=[Gmail]/All Mail"