After liberating gran colombia from spanish rule, bolívar joined forces with san martín to free what other territory from spain?