per-project .vimrc
Lotsastuff
New things
New things
Merge branch 'master' into java

Conflicts:
	.gitmodules
	.vim/bundle/dilimitMate
	.vim/bundle/vim-markdown
	.vimrc
Moar