clean up daemons and fab commands
merge
Merge branch 'merge-mistake' into faster-grandma

Conflicts:
	fabfile/daemons.py
	fabfile/render.py