reconfigured site to honor baseurl
update settings to work locally and on current GH Pages settings
Merge branch 'gh-pages' into gh-pages-origin

Conflicts:
	_config.yml
Fix _config.