Merge branch 'jmw-dev'

Conflicts:
	app/config/sculpin_site.yml