Use iD and JOSM as default editors
Update unittest related to default editors (oops)
Merge branch 'master' into gh-pages