Merge branch 'develop' of github.com:Selz/plyr into develop

# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
#	src/js/defaults.js

src/js/defaults.js

@@ -28,9 +28,6 @@ const defaults = {
     // Aspect ratio (for embeds)
     ratio: '16:9',
 
-    // Looping
-    loop: false,
-
     // Click video to play
     clickToPlay: true,
 
@@ -57,6 +54,13 @@ const defaults = {
         options: ['hd2160', 'hd1440', 'hd1080', 'hd720', 'large', 'medium', 'small', 'tiny', 'default'],
     },
 
+    // Set loops
+    loop: {
+        active: false,
+        // start: null,
+        // end: null,
+    },
+
     // Speed default and options to display
     speed: {
         default: 1,