Switch URLs to they are gh pages (aka subdomain) friendly
Merge branches 'gh-pages' and 'master'