Playing with our own web hook for deploying the static nanoc site.
Merge branch 'master' into static_site_webhook

Conflicts:
	Gemfile.lock
Fix web hook for deployments.
Merge branch 'master' into gsa