adding watch and stop
formatting fixes
Merge branch 'master' into f/actoriface

Conflicts:
	actor.go