remove duplicate vundle entries, portable vim home fix
fix merge conflict, use ours