fasd (though I still don't know how to use it)
arpeggio and fast window / buffer management
bring arpeggio mappings inside vimrc
epic reorganization of vimrc
misc tweaks stolen from @cnk's vimrc
indent 2 spaces in html / css
some abbreviations for debugging python code
Merge branch 'master' of github.com:cberzan/dotfiles

Conflicts:
	bashrc