toolkit dev
Merge branch 'master' into JIRA-GWEB-225

Conflicts:
	dev.globus.org-staging
installed gem nanoc-toolbox
installed gem nanoc-toolbox