diff --git a/dist/index.html b/dist/index.html
index f33bf3d8d..388805817 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -32,10 +32,10 @@
             })();
 
             // crazyegg
-            setTimeout(function(){var a=document.createElement("script");
-            var b=document.getElementsByTagName("script")[0];
-            a.src=document.location.protocol+"//dnn506yrbagrg.cloudfront.net/pages/scripts/0013/6714.js?"+Math.floor(new Date().getTime()/3600000);
-            a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
+            setTimeout(function(){var a=document.createElement('script');
+            var b=document.getElementsByTagName('script')[0];
+            a.src=document.location.protocol+'//dnn506yrbagrg.cloudfront.net/pages/scripts/0013/6714.js?'+Math.floor(new Date().getTime()/3600000);
+            a.async=true;a.type='text/javascript';b.parentNode.insertBefore(a,b)}, 1);
 
             if (typeof iD == 'undefined' || !iD.detect().support) {
                 document.getElementById('id-container').innerHTML = 'Sorry, your browser is not currently supported. Please use Potlatch 2 to edit the map.';
diff --git a/index.html b/index.html
index 77c775929..b4ef0c747 100644
--- a/index.html
+++ b/index.html
@@ -47,11 +47,11 @@
 
         <script src='data/data_dev.js'></script>
 
-        <script src="js/id/geo.js"></script>
-        <script src="js/id/geo/extent.js"></script>
-        <script src="js/id/geo/intersection.js"></script>
-        <script src="js/id/geo/multipolygon.js"></script>
-        <script src="js/id/geo/raw_mercator.js"></script>
+        <script src='js/id/geo.js'></script>
+        <script src='js/id/geo/extent.js'></script>
+        <script src='js/id/geo/intersection.js'></script>
+        <script src='js/id/geo/multipolygon.js'></script>
+        <script src='js/id/geo/raw_mercator.js'></script>
 
         <script src='js/id/renderer/background.js'></script>
         <script src='js/id/renderer/background_source.js'></script>
@@ -59,25 +59,25 @@
         <script src='js/id/renderer/map.js'></script>
         <script src='js/id/renderer/tile_layer.js'></script>
 
-        <script src="js/id/svg.js"></script>
-        <script src="js/id/svg/areas.js"></script>
-        <script src="js/id/svg/debug.js"></script>
-        <script src="js/id/svg/defs.js"></script>
+        <script src='js/id/svg.js'></script>
+        <script src='js/id/svg/areas.js'></script>
+        <script src='js/id/svg/debug.js'></script>
+        <script src='js/id/svg/defs.js'></script>
         <script src='js/id/svg/gpx.js'></script>
-        <script src="js/id/svg/icon.js"></script>
-        <script src="js/id/svg/labels.js"></script>
-        <script src="js/id/svg/lines.js"></script>
+        <script src='js/id/svg/icon.js'></script>
+        <script src='js/id/svg/labels.js'></script>
+        <script src='js/id/svg/lines.js'></script>
         <script src='js/id/svg/mapillary_images.js'></script>
         <script src='js/id/svg/mapillary_signs.js'></script>
-        <script src="js/id/svg/midpoints.js"></script>
-        <script src="js/id/svg/osm.js"></script>
-        <script src="js/id/svg/points.js"></script>
-        <script src="js/id/svg/layers.js"></script>
-        <script src="js/id/svg/tag_classes.js"></script>
-        <script src="js/id/svg/turns.js"></script>
-        <script src="js/id/svg/vertices.js"></script>
+        <script src='js/id/svg/midpoints.js'></script>
+        <script src='js/id/svg/osm.js'></script>
+        <script src='js/id/svg/points.js'></script>
+        <script src='js/id/svg/layers.js'></script>
+        <script src='js/id/svg/tag_classes.js'></script>
+        <script src='js/id/svg/turns.js'></script>
+        <script src='js/id/svg/vertices.js'></script>
 
-        <script src="js/id/ui.js"></script>
+        <script src='js/id/ui.js'></script>
         <script src='js/id/ui/intro.js'></script>
         <script src='js/id/ui/info.js'></script>
         <script src='js/id/ui/attribution.js'></script>
@@ -225,14 +225,14 @@
                     .call(iD.ui.SourceSwitch(id)
                         .keys([
                             {
-                                "url": "http://www.openstreetmap.org",
-                                "oauth_consumer_key": "5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT",
-                                "oauth_secret": "aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL"
+                                'url': 'http://www.openstreetmap.org',
+                                'oauth_consumer_key': '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
+                                'oauth_secret': 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL'
                             },
                             {
-                                "url": "http://api06.dev.openstreetmap.org",
-                                "oauth_consumer_key": "zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R",
-                                "oauth_secret": "aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p"
+                                'url': 'http://api06.dev.openstreetmap.org',
+                                'oauth_consumer_key': 'zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R',
+                                'oauth_secret': 'aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p'
                             }
                         ]));
 
diff --git a/test/index_packaged.html b/test/index_packaged.html
index 0d0c89d47..6e633540f 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -3,17 +3,17 @@
 <head>
     <meta charset='utf-8'>
     <title>Mocha Tests</title>
-    <link rel="stylesheet" href="../node_modules/mocha/mocha.css">
-    <link rel="stylesheet" href="css/map.css">
+    <link rel='stylesheet' href='../node_modules/mocha/mocha.css'>
+    <link rel='stylesheet' href='css/map.css'>
 </head>
 <body>
-    <div id="mocha"></div>
+    <div id='mocha'></div>
 
-    <script src="../node_modules/mocha/mocha.js"></script>
-    <script src="../node_modules/chai/chai.js"></script>
-    <script src="../node_modules/sinon/pkg/sinon.js"></script>
-    <script src="../node_modules/sinon-chai/lib/sinon-chai.js"></script>
-    <script src="../node_modules/happen/src/happen.js"></script>
+    <script src='../node_modules/mocha/mocha.js'></script>
+    <script src='../node_modules/chai/chai.js'></script>
+    <script src='../node_modules/sinon/pkg/sinon.js'></script>
+    <script src='../node_modules/sinon-chai/lib/sinon-chai.js'></script>
+    <script src='../node_modules/happen/src/happen.js'></script>
 
     <script>
     if (typeof initMochaPhantomJS === 'function') {
@@ -26,104 +26,104 @@
     <script src='../dist/presets.js'></script>
     <script src='../dist/imagery.js'></script>
 
-    <script src="spec/spec_helpers.js"></script>
+    <script src='spec/spec_helpers.js'></script>
 
     <!-- include spec files here... -->
-    <script src="spec/lib/d3.keybinding.js"></script>
-    <script src="spec/lib/diff3.js"></script>
-    <script src="spec/lib/locale.js"></script>
+    <script src='spec/lib/d3.keybinding.js'></script>
+    <script src='spec/lib/diff3.js'></script>
+    <script src='spec/lib/locale.js'></script>
 
-    <script src="spec/actions/add_entity.js"></script>
-    <script src="spec/actions/add_member.js"></script>
-    <script src="spec/actions/add_midpoint.js"></script>
-    <script src="spec/actions/change_member.js"></script>
-    <script src="spec/actions/change_preset.js"></script>
-    <script src="spec/actions/change_tags.js"></script>
+    <script src='spec/actions/add_entity.js'></script>
+    <script src='spec/actions/add_member.js'></script>
+    <script src='spec/actions/add_midpoint.js'></script>
+    <script src='spec/actions/change_member.js'></script>
+    <script src='spec/actions/change_preset.js'></script>
+    <script src='spec/actions/change_tags.js'></script>
     <script src='spec/actions/circularize.js'></script>
     <script src='spec/actions/connect.js'></script>
-    <script src="spec/actions/copy_entities.js"></script>
+    <script src='spec/actions/copy_entities.js'></script>
     <script src='spec/actions/delete_member.js'></script>
-    <script src="spec/actions/delete_multiple.js"></script>
-    <script src="spec/actions/delete_node.js"></script>
-    <script src="spec/actions/delete_relation.js"></script>
-    <script src="spec/actions/delete_way.js"></script>
+    <script src='spec/actions/delete_multiple.js'></script>
+    <script src='spec/actions/delete_node.js'></script>
+    <script src='spec/actions/delete_relation.js'></script>
+    <script src='spec/actions/delete_way.js'></script>
     <script src='spec/actions/discard_tags.js'></script>
     <script src='spec/actions/disconnect.js'></script>
-    <script src="spec/actions/join.js"></script>
+    <script src='spec/actions/join.js'></script>
     <script src='spec/actions/merge.js'></script>
     <script src='spec/actions/merge_polygon.js'></script>
     <script src='spec/actions/merge_remote_changes.js'></script>
-    <script src="spec/actions/move.js"></script>
-    <script src="spec/actions/move_node.js"></script>
-    <script src="spec/actions/noop.js"></script>
-    <script src="spec/actions/orthogonalize.js"></script>
-    <script src="spec/actions/restrict_turn.js"></script>
-    <script src="spec/actions/reverse.js"></script>
-    <script src="spec/actions/revert.js"></script>
-    <script src="spec/actions/split.js"></script>
-    <script src="spec/actions/straighten.js"></script>
-    <script src="spec/actions/unrestrict_turn.js"></script>
+    <script src='spec/actions/move.js'></script>
+    <script src='spec/actions/move_node.js'></script>
+    <script src='spec/actions/noop.js'></script>
+    <script src='spec/actions/orthogonalize.js'></script>
+    <script src='spec/actions/restrict_turn.js'></script>
+    <script src='spec/actions/reverse.js'></script>
+    <script src='spec/actions/revert.js'></script>
+    <script src='spec/actions/split.js'></script>
+    <script src='spec/actions/straighten.js'></script>
+    <script src='spec/actions/unrestrict_turn.js'></script>
 
-    <script src="spec/geo.js"></script>
-    <script src="spec/geo/extent.js"></script>
-    <script src="spec/geo/intersection.js"></script>
-    <script src="spec/geo/multipolygon.js"></script>
+    <script src='spec/geo.js'></script>
+    <script src='spec/geo/extent.js'></script>
+    <script src='spec/geo/intersection.js'></script>
+    <script src='spec/geo/multipolygon.js'></script>
 
-    <script src="spec/core/connection.js"></script>
-    <script src="spec/core/graph.js"></script>
-    <script src="spec/core/entity.js"></script>
-    <script src="spec/core/node.js"></script>
-    <script src="spec/core/way.js"></script>
-    <script src="spec/core/relation.js"></script>
-    <script src="spec/core/history.js"></script>
-    <script src="spec/core/difference.js"></script>
-    <script src="spec/core/tree.js"></script>
+    <script src='spec/core/connection.js'></script>
+    <script src='spec/core/graph.js'></script>
+    <script src='spec/core/entity.js'></script>
+    <script src='spec/core/node.js'></script>
+    <script src='spec/core/way.js'></script>
+    <script src='spec/core/relation.js'></script>
+    <script src='spec/core/history.js'></script>
+    <script src='spec/core/difference.js'></script>
+    <script src='spec/core/tree.js'></script>
 
-    <script src="spec/renderer/tile_layer.js"></script>
-    <script src="spec/renderer/background_source.js"></script>
-    <script src="spec/renderer/features.js"></script>
-    <script src="spec/renderer/map.js"></script>
+    <script src='spec/renderer/tile_layer.js'></script>
+    <script src='spec/renderer/background_source.js'></script>
+    <script src='spec/renderer/features.js'></script>
+    <script src='spec/renderer/map.js'></script>
 
-    <script src="spec/svg.js"></script>
-    <script src="spec/svg/areas.js"></script>
-    <script src="spec/svg/icon.js"></script>
-    <script src="spec/svg/lines.js"></script>
-    <script src="spec/svg/midpoints.js"></script>
-    <script src="spec/svg/points.js"></script>
-    <script src="spec/svg/vertices.js"></script>
-    <script src="spec/svg/tag_classes.js"></script>
+    <script src='spec/svg.js'></script>
+    <script src='spec/svg/areas.js'></script>
+    <script src='spec/svg/icon.js'></script>
+    <script src='spec/svg/lines.js'></script>
+    <script src='spec/svg/midpoints.js'></script>
+    <script src='spec/svg/points.js'></script>
+    <script src='spec/svg/vertices.js'></script>
+    <script src='spec/svg/tag_classes.js'></script>
 
-    <script src="spec/ui/inspector.js"></script>
-    <script src="spec/ui/raw_tag_editor.js"></script>
-    <script src="spec/ui/modal.js"></script>
-    <script src="spec/ui/flash.js"></script>
-    <script src="spec/ui/confirm.js"></script>
-    <script src="spec/ui/cmd.js"></script>
+    <script src='spec/ui/inspector.js'></script>
+    <script src='spec/ui/raw_tag_editor.js'></script>
+    <script src='spec/ui/modal.js'></script>
+    <script src='spec/ui/flash.js'></script>
+    <script src='spec/ui/confirm.js'></script>
+    <script src='spec/ui/cmd.js'></script>
 
-    <script src="spec/ui/preset/access.js"></script>
-    <script src="spec/ui/preset/localized.js"></script>
-    <script src="spec/ui/preset/wikipedia.js"></script>
+    <script src='spec/ui/preset/access.js'></script>
+    <script src='spec/ui/preset/localized.js'></script>
+    <script src='spec/ui/preset/wikipedia.js'></script>
 
-    <script src="spec/services/mapillary.js"></script>
-    <script src="spec/services/nominatim.js"></script>
-    <script src="spec/services/taginfo.js"></script>
+    <script src='spec/services/mapillary.js'></script>
+    <script src='spec/services/nominatim.js'></script>
+    <script src='spec/services/taginfo.js'></script>
 
-    <script src="spec/util.js"></script>
+    <script src='spec/util.js'></script>
     <script src='spec/util/session_mutex.js'></script>
     <script src='spec/util/suggest_names.js'></script>
 
-    <script src="spec/behavior/hash.js"></script>
-    <script src="spec/behavior/hover.js"></script>
-    <script src="spec/behavior/select.js"></script>
-    <script src="spec/behavior/lasso.js"></script>
+    <script src='spec/behavior/hash.js'></script>
+    <script src='spec/behavior/hover.js'></script>
+    <script src='spec/behavior/select.js'></script>
+    <script src='spec/behavior/lasso.js'></script>
 
-    <script src="spec/modes/add_point.js"></script>
+    <script src='spec/modes/add_point.js'></script>
 
-    <script src="spec/presets.js"></script>
-    <script src="spec/presets/preset.js"></script>
-    <script src="spec/presets/collection.js"></script>
-    <script src="spec/presets/category.js"></script>
-    <script src="spec/id.js"></script>
+    <script src='spec/presets.js'></script>
+    <script src='spec/presets/preset.js'></script>
+    <script src='spec/presets/collection.js'></script>
+    <script src='spec/presets/category.js'></script>
+    <script src='spec/id.js'></script>
 
     <script>
         window.mocha.run();
diff --git a/test/rendering.html b/test/rendering.html
index c442b7d80..314429de8 100644
--- a/test/rendering.html
+++ b/test/rendering.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset='utf-8'>
     <title>Rendering Tests</title>
-    <link rel="stylesheet" href="../css/map.css">
+    <link rel='stylesheet' href='../css/map.css'>
 </head>
 <body>
     <!-- include source files here... -->
@@ -13,19 +13,19 @@
     <script src='../js/id/id.js'></script>
     <script src='../js/id/util.js'></script>
 
-    <script src="../js/id/geo.js"></script>
-    <script src="../js/id/geo/extent.js"></script>
+    <script src='../js/id/geo.js'></script>
+    <script src='../js/id/geo/extent.js'></script>
 
-    <script src="../js/id/svg.js"></script>
-    <script src="../js/id/svg/areas.js"></script>
-    <script src="../js/id/svg/icon.js"></script>
-    <script src="../js/id/svg/lines.js"></script>
-    <script src="../js/id/svg/midpoints.js"></script>
-    <script src="../js/id/svg/osm.js"></script>
-    <script src="../js/id/svg/points.js"></script>
-    <script src="../js/id/svg/layers.js"></script>
-    <script src="../js/id/svg/tag_classes.js"></script>
-    <script src="../js/id/svg/vertices.js"></script>
+    <script src='../js/id/svg.js'></script>
+    <script src='../js/id/svg/areas.js'></script>
+    <script src='../js/id/svg/icon.js'></script>
+    <script src='../js/id/svg/lines.js'></script>
+    <script src='../js/id/svg/midpoints.js'></script>
+    <script src='../js/id/svg/osm.js'></script>
+    <script src='../js/id/svg/points.js'></script>
+    <script src='../js/id/svg/layers.js'></script>
+    <script src='../js/id/svg/tag_classes.js'></script>
+    <script src='../js/id/svg/vertices.js'></script>
 
     <script src='../js/id/core/entity.js'></script>
     <script src='../js/id/core/graph.js'></script>
@@ -36,17 +36,17 @@
 
     <script src='../js/lib/id/presets.js'></script>
 
-    <form style="position: fixed; right: 10px; bottom: 10px">
-        <input id="background-color" type="range" min="0" max="255" value="255">
-        <label for="background-color">Background Color</label>
+    <form style='position: fixed; right: 10px; bottom: 10px'>
+        <input id='background-color' type='range' min='0' max='255' value='255'>
+        <label for='background-color'>Background Color</label>
     </form>
 
     <script>
-        var bg = d3.select("#background-color")
-            .on("change", function () {
-                var v = bg.property("value");
-                d3.select("body")
-                    .style("background-color", d3.rgb(v,v,v));
+        var bg = d3.select('#background-color')
+            .on('change', function () {
+                var v = bg.property('value');
+                d3.select('body')
+                    .style('background-color', d3.rgb(v,v,v));
             });
 
         var infiniteExtent = iD.geo.Extent([0, 0], [Infinity, Infinity]),
@@ -61,28 +61,28 @@
         context.presets = function() {
             return iD.presets.presets().load({
                 presets: {
-                    "amenity/restaurant": {
+                    'amenity/restaurant': {
                         geometry: ['point'],
                         tags: {
                             amenity: 'restaurant'
                         },
                         icon: 'restaurant'
                     },
-                    "highway/turning_circle": {
+                    'highway/turning_circle': {
                         geometry: ['vertex'],
                         tags: {
                             highway: 'turning_circle'
                         },
                         icon: 'circle'
                     },
-                    "railway/level_crossing": {
+                    'railway/level_crossing': {
                         geometry: ['vertex'],
                         tags: {
                             railway: 'level_crossing'
                         },
                         icon: 'cross'
                     },
-                    "other": {
+                    'other': {
                         geometry: ['point', 'vertex', 'line', 'area', 'relation'],
                         tags: {}
                     }
@@ -92,9 +92,9 @@
 
         iD.data = {
             featureIcons: {
-                "restaurant": {"12":[0,3840],"18":[0,3854],"24":[0,3874]},
-                "cross":{"12":[0,1320],"18":[0,1334],"24":[0,1354]},
-                "circle":{"12":[0,1020],"18":[0,1034],"24":[0,1054]}
+                'restaurant': {'12':[0,3840],'18':[0,3854],'24':[0,3874]},
+                'cross':{'12':[0,1320],'18':[0,1334],'24':[0,1354]},
+                'circle':{'12':[0,1020],'18':[0,1034],'24':[0,1054]}
             }
         };
 
@@ -107,7 +107,7 @@
         };
 
         function tagHTML(d) {
-            return _.map(d, function (value, key) { return key + "=" + value;}).join("<br>");
+            return _.map(d, function (value, key) { return key + '=' + value;}).join('<br>');
         }
     </script>
 
@@ -115,7 +115,7 @@
         <thead>
             <tr><th></th><th>Base</th><th>Hover</th><th>Selected</th></tr>
         </thead>
-        <tbody class="points">
+        <tbody class='points'>
         </tbody>
     </table>
 
@@ -160,10 +160,10 @@
 
     <table>
         <thead>
-            <tr><th></th><th colspan="3">z16</th><th colspan="3">z17</th><th colspan="3">z18</th></tr>
+            <tr><th></th><th colspan='3'>z16</th><th colspan='3'>z17</th><th colspan='3'>z18</th></tr>
             <tr><th></th><th>Base</th><th>Hover</th><th>Selected</th><th>Base</th><th>Hover</th><th>Selected</th><th>Base</th><th>Hover</th><th>Selected</th></tr>
         </thead>
-        <tbody class="vertices">
+        <tbody class='vertices'>
         </tbody>
     </table>
 
@@ -229,10 +229,10 @@
 
     <table>
         <thead>
-            <tr><th></th><th colspan="3">z16</th><th colspan="3">z17</th></tr>
+            <tr><th></th><th colspan='3'>z16</th><th colspan='3'>z17</th></tr>
             <tr><th></th><th>Base</th><th>Hover</th><th>Selected</th><th>Base</th><th>Hover</th><th>Selected</th></tr>
         </thead>
-        <tbody class="highways">
+        <tbody class='highways'>
         </tbody>
     </table>
 
@@ -320,7 +320,7 @@
         <thead>
             <tr><th></th><th>Base</th><th>Selected</th></tr>
         </thead>
-        <tbody class="areas">
+        <tbody class='areas'>
         </tbody>
     </table>
 
@@ -341,7 +341,7 @@
           .enter().append('tr');
 
         row.append('th')
-            .html(function (d) { return _.map(d, function (value, key) { return key + "=" + value;}).join("<br>"); });
+            .html(function (d) { return _.map(d, function (value, key) { return key + '=' + value;}).join('<br>'); });
 
         var a = iD.Node({loc: [15, 15]}),
             b = iD.Node({loc: [85, 15]}),