use Vundle's new syntax
Merge branch 'master' of github.com:klauern/dot-vim

Conflicts:
	vimrc
cleanup and update
add Codeschool color scheme