Cleaned up a lost console.log()
Merge branch 'master' into gh-pages