merging
switch to using com.stuartsierra.component for system management
Merge branch 'master' into tomlynch.io

Conflicts:
	src/clj/silkscreen/web.clj