Merge branch 'master' of github.com:aquatix/dotfiles

.bash_aliases

@@ -46,7 +46,7 @@ alias takeover="tmux detach -a"
 # 20140825 as there is no `pip upgrade`, this has to do
 alias pip_upgrade="pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs pip install -U"
 
-# 20140912
+# 20140908 reload tmux config
 alias tmux_reload="tmux source-file ~/.tmux.conf"
 
 function fuck() {

.vimrc

@@ -25,8 +25,13 @@ Plugin 'mhinz/vim-signify'
 Plugin 'tpope/vim-sensible'
 " Nice colour scheme
 Plugin 'jnurmine/Zenburn.git'
+" Quick file system tree, mapped to Ctrl+n for quick toggle
+Plugin 'scrooloose/nerdtree'
+map <C-n> :NERDTreeToggle<CR>
+" close vim if the only window left open is a NERDTree
+autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 
-" == 
+" == Content convenience
 
 " Python autocompletion
 Plugin 'davidhalter/jedi-vim'