updated
updated
Merge branch '2013-04-24'

Conflicts:
	.vim/.netrwhist
	.vim/autoload/pathogen.vim
	.vim/bash-support/doc/ChangeLog
	.vim/bash-support/doc/bash-hot-keys.pdf
	.vim/bash-support/doc/bash-hot-keys.tex
	.vim/bash-support/wordlists/bash.list
	.vim/bundle/vim-javascript/indent/javascript.vim
	.vim/colors/ir_black.vim
	.vim/doc/bashsupport.txt
	.vim/ftplugin/bash-support.vim
	.vim/ftplugin/sh.vim
	.vim/indent/python.vim
	.vim/plugin/vcsbzr.vim
	.vim/plugin/vcscommand.vim
	.vim/plugin/vcscvs.vim
	.vim/plugin/vcsgit.vim
	.vim/plugin/vcshg.vim
	.vim/plugin/vcssvk.vim
	.vim/plugin/vcssvn.vim