Revert plugins outsourcing, cause Macvim problems