modified:   .gitmodules
	new file:   bundle/fuzzyfinder
	new file:   bundle/l9
	deleted:    bundle/supertab
	new file:   bundle/surround
	new file:   bundle/vimux
	modified:   vimrc
	modified:   .gitmodules
Merge branch 'master' of github.com:pappelt/dotvim

Conflicts:
	vimrc

added shortcut for jumping to classes under cursor
	modified:   vimrc
	modified:   vimrc
cleanup
Merge branch 'master' into brainslug

Conflicts:
	.gitmodules
	vimrc