Cleanup, improved support for GH Pages URLs