--- a/.bashrc	Mon Sep 19 19:27:16 2011 +0300
+++ b/.bashrc	Mon Sep 19 21:08:02 2011 +0300
@@ -46,6 +46,9 @@
 # Make Bash append rather than overwrite the history.
 shopt -s histappend
 
+shopt -s histreedit
+shopt -s histverify
+
 # Minor errors in the spelling of a directory component in a cd command will
 # be corrected.
 shopt -s cdspell

--- a/.gitconfig	Mon Sep 19 19:27:16 2011 +0300
+++ b/.gitconfig	Mon Sep 19 21:08:02 2011 +0300
@@ -29,6 +29,8 @@
 
 [diff]
 color = auto
+status = auto
+branch = auto
 # Makes the diff much shorter when moving or copying files.
 rename = copy
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.muttrc	Mon Sep 19 21:08:02 2011 +0300
@@ -0,0 +1,21 @@
+set folder = ~/Mail     # Directory that contains all mail files (mailboxes)
+set realname  = "Steve Kemp"
+set signature = ~/.signature
+set record    = +sent-mail      # Where to save copies of outgoing mail
+set fast_reply          # replies and forwards with same names and subject
+set copy="yes"          # Always save a copy of outgoing mails
+set delete="yes"        # Don't ask for mails flagged 'deleted' when exiting
+set move="no"           # Don't move to 'mbox'
+set postpone="ask-yes"  # Unsent messages
+set confirmappend="no"  # Don't ask to append a mail
+set confirmcreate="yes" # Ask before creating a new folder
+set save_empty="no"     # Delete empty folders
+macro index .n "l~N\n" # Show new messages macro index
+macro index .a "l~A\n" # Show all messages
+macro pager "w"      "set invsmart_wrap invmarkers" # Toggle wrap stuff
+# Allow headers to be headered.
+set edit_headers=yes
+
+set pager_index_lines=10
+set pager_stop=yes
+set mark_old=no

--- a/.screenrc	Mon Sep 19 19:27:16 2011 +0300
+++ b/.screenrc	Mon Sep 19 21:08:02 2011 +0300
@@ -1,3 +1,8 @@
+
+startup_message off
+
+# If a window goes unresponsive, don't block the whole session waiting for it.
+nonblock on
 
 # Ctrl+Tab and Ctrl+Shift+Tab to switch session in GNU Screen.
 bindkey "^[[1;5I" next

--- a/Makefile	Mon Sep 19 19:27:16 2011 +0300
+++ b/Makefile	Mon Sep 19 21:08:02 2011 +0300
@@ -25,7 +25,7 @@
 OVERRIDDEN_ITEMS = \
     .inputrc .minttyrc .Xdefaults .xinitrc .xserverrc .screenrc \
     .bashrc .zshrc .vimrc .ssh \
-    .mailsign .tidy \
+    .mailsign .muttrc .tidy \
     .dictrc \
     .hgrc .hgignore .bazaar .gitconfig .gitignore \
     .gnupg