Revert "Merge branch 'unite'"

This reverts commit beb74c192195cde512e48e97f1a5a3699c8def8d, reversing
changes made to 7844164b4c7f91d56875322cf21ff0641b7c5814.

Conflicts:
	.gitmodules
	.vimrc