Merge remote-tracking branch 'origin/master'

Conflicts:
	tmux.conf
	vimrc

tmux.conf

@@ -1,38 +1,44 @@
 # tmux config
 # Eryn Wells <eryn@erynwells.me>
 
-set -g default-terminal "screen-256color"
 set -g prefix C-f
+
 # Don't destroy sessions that have no clients attached.
 set -g exit-unattached off
-# Set terminal titles
+
+set -g default-terminal "screen-256color"
+set -g history-limit 10000
+
+# Bells from everywhere
+set -g bell-action any
+set -g visual-bell off
+
+# Pass xterm titles through
 set -g set-titles on
 set -g set-titles-string "#T"
-# Ring bells for actions on any window in the session
-set -g bell-action any
-# Use audible bells
-set -g visual-bell off
-# Keep 10k lines of history for each window
-set -g history-limit 10000
+
 # Use vi keys for copy mode
 set -g mode-keys vi
-# Start window numbering at 1, not 0
-set -g base-index 1
-# Start pane numbering at 1, not 0
-set -g pane-base-index 1
 set -g repeat-time 0
 
+# No left status; right status bar is session name
 set -g status-bg green
 set -g status-left ""
 set -g status-left-attr none
 set -g status-right "| #S "
 set -g status-right-attr none
 
+# Start window and pane indexing from 1 instead of 0
+set-option -g base-index 1
+set-option -g pane-base-index 1
+
+# Tabs like this: " <index>:<window_name>(<pane_number>) "
 setw -g window-status-format " #I:#W(#P) "
 setw -g window-status-current-bg yellow
 setw -g window-status-current-format " #I:#W(#P) "
 
 setw -g alternate-screen on
+
 setw -g clock-mode-style 24
 
 bind-key C-a last-window