Merge branch 'master' into update

# Conflicts:
#	manifest.json

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Video Speed Controller",
   "short_name": "videospeed",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "manifest_version": 2,
   "description": "Speed up, slow down, advance and rewind any HTML5 video with quick shortcuts.",
   "homepage_url": "https://github.com/codebicycle/videospeed",
@@ -14,10 +14,10 @@
   "browser_action": {
     "browser_style": true,
     "default_icon": {
-        "19": "icons/icon19.png",
-        "38": "icons/icon38.png",
-        "48": "icons/icon48.png"
-      },
+      "19": "icons/icon19.png",
+      "38": "icons/icon38.png",
+      "48": "icons/icon48.png"
+    },
     "default_popup": "popup.html"
   },
   "content_scripts": [{
@@ -27,7 +27,6 @@
         "https://plus.google.com/hangouts/*",
         "https://hangouts.google.com/hangouts/*",
         "https://teamtreehouse.com/*",
-        "https://www.lynda.com/*",
         "http://www.hitbox.tv/*"
       ],
       "css": [ "inject.css" ],