Clear out .gitmodules, something got screwy
Restore pathogen plugins via submodules, again ಠ_ಠ

I should probably look at something like vundle[1] instead of wrestling
with submodules and merges and renames and crap.

[1]: https://github.com/gmarik/vundle