don't assume longitude grid is regular in addcyclic

also merge setup.py from master