XML.
Merge branch '3.0' of https://github.com/paulhybryant/spf13-vim into 3.0

Conflicts:
	.vimrc.local