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

Conflicts:
	.bashrc
	.dwm_statusbar
	.vim/.netrwhist
	.vim/doc/clojure.txt
	.vim/ftdetect/clojure.vim
	.vim/ftplugin/clojure.vim
	.vim/indent/clojure.vim
	.vim/syntax/clojure.vim
Merge branch 'fibonazi' of github.com:nlacasse/dotfiles

Conflicts:
	.bashrc
	.dwm_statusbar
Merge branch 'fibonazi'