Merge remote branch 'upstream/master' into getString-error

Gruntfile.js

@@ -64,7 +64,7 @@ module.exports = function(grunt) {
                 banner: "//! <%= pkg.name %> <%= pkg.version %>\n"
                     + "//! Built on <%= grunt.template.today('yyyy-mm-dd') %>\n"
                     + "//! Git commit: <%= gitInfo %>\n"
-                    + "//! http://openseadragon.github.com\n\n",
+                    + "//! http://openseadragon.github.io\n\n",
                 process: true
             },
             dist: {

README.md

@@ -4,7 +4,7 @@ This project is a fork of the OpenSeadragon project at http://openseadragon.code
 
 ## On the Web
 
-http://openseadragon.github.com/
+http://openseadragon.github.io/
 
 ## First Time Setup