diff --git a/.csshrc b/.csshrc
index 0cb13c9..8ee6387 100644
--- a/.csshrc
+++ b/.csshrc
@@ -13,3 +13,53 @@ mnrlnx01cart = mnrlnx01cart01 mnrlnx01cart02 mnrlnx01cart03 mnrlnx01cart04 mnrln
 mnrlnx02cart = mnrlnx02cart01 mnrlnx02cart02 mnrlnx02cart03 mnrlnx02cart04 mnrlnx02cart05 mnrlnx02cart06 mnrlnx02cart07 mnrlnx02cart08 mnrlnx02cart09 mnrlnx02cart10 mnrlnx02cart11 mnrlnx02cart12 mnrlnx02cart13 mnrlnx02cart14 mnrlnx02cart15 mnrlnx02cart16 mnrlnx02cart17 mnrlnx02cart18 mnrlnx02cart19 mnrlnx02cart20 mnrlnx02cart21 mnrlnx02cart22 mnrlnx02cart23 mnrlnx02cart24 mnrlnx02cart25 mnrlnx02cart26 mnrlnx02cart27 mnrlnx02cart28 mnrlnx02cart29 mnrlnx02cart30
 
 mmslnx260 = mmslnx260s01 mmslnx260s02 mmslnx260s03 mmslnx260s04 mmslnx260s05 mmslnx260s06 mmslnx260s07 mmslnx260s08 mmslnx260s09 mmslnx260s10 mmslnx260s11 mmslnx260s12 mmslnx260s13 mmslnx260s14 mmslnx260s15 mmslnx260s16 mmslnx260s17 mmslnx260s18 mmslnx260s19 mmslnx260s20 mmslnx260s21 mmslnx260s22 mmslnx260s23 mmslnx260s24 mmslnx260s25 mmslnx260s26 mmslnx260s27 mmslnx260s28 mmslnx260s29 mmslnx260s30
+
+auto_quit=no
+command=
+comms=ssh
+console_position=
+extra_cluster_file=
+history_height=10
+history_width=40
+key_addhost=Control-Shift-plus
+key_clientname=Alt-n
+key_history=Alt-h
+key_paste=Control-v
+key_quit=Control-q
+key_retilehosts=Alt-r
+max_addhost_menu_cluster_items=6
+max_host_menu_items=30
+menu_host_autotearoff=0
+menu_send_autotearoff=0
+method=ssh
+mouse_paste=Button-2
+rsh_args=
+screen_reserve_bottom=60
+screen_reserve_left=0
+screen_reserve_right=0
+screen_reserve_top=0
+send_menu_xml_file=/home/tom/.csshrc_send_menu
+show_history=0
+ssh=/usr/bin/ssh
+ssh_args= -x -o ConnectTimeout=10
+telnet_args=
+terminal=/usr/bin/xterm
+terminal_allow_send_events=-xrm '*.VT100.allowSendEvents:true'
+terminal_args=
+terminal_bg_style=dark
+terminal_colorize=1
+terminal_decoration_height=10
+terminal_decoration_width=8
+terminal_font=6x13
+terminal_reserve_bottom=0
+terminal_reserve_left=5
+terminal_reserve_right=0
+terminal_reserve_top=5
+terminal_size=80x24
+terminal_title_opt=-T
+title=CSSH
+unmap_on_redraw=no
+use_hotkeys=yes
+user=administrator
+window_tiling=yes
+window_tiling_direction=right
diff --git a/.vimrc b/.vimrc
index b34af64..0636929 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,6 +9,8 @@ match ErrorMsg '\s\+$'
 match ErrorMsg '/ \+\ze\t'
 
 " Change Tab settings
+autocmd FileType commitmsg set textwidth=72
+autocmd FileType mail set textwidth=0
 autocmd FileType puppet set tabstop=2|set shiftwidth=2|set expandtab
 
 set laststatus=2