disabling XML folding, quieting syntastic...
Merge branch 'master' of github.com:/davidstelter/.vim

Conflicts:
	vimrc
Moved wake submodule to https instead of git proto