Amended title, config, added cname, merged branch master into gh-pages