adding coffee-script and jade bundles to vim
adding Processing vim syntax files
Merge branch 'master' of github.com:entombedvirus/dotfiles

Conflicts:
	.gitmodules
Merge remote-tracking branch 'origin/master'

Conflicts:
	etc/vim/bundle/vim-coffee-script
enable code folding by default; but not at startup
updating gitconfig
Merge remote-tracking branch 'origin/master'
adding vim-thrift plugin