initial commit
Fixing the site root
Bumping common stuff
Bumping versions of common stuff
Fixing .gitmodules
Merge remote-tracking branch 'template/gh-pages' into gh-pages

Conflicts:
	.gitignore
	.gitmodules
	Gemfile
	Gemfile.lock
	README.md
	_config.yml
	_layouts
	common
Some cleanup and update to the latest theme