Misc compatibility fixes
Merge branch 'master' of http://github.com/NickCody/dotfiles

Conflicts:
	dotvimrc
Strange spf13 merge