Include default tileset (checking out master from gh-pages deletes local copy)
Default tileset
Merge branch 'master' into focus