Using PotLatch and JOSM now, but the tutorials seem to be on old versions of JOSM - couldn't find a new video tutorial. Seems OK though - some local residential areas uploaded...