bug fix in Makefile and including supervisor dependency
Merge branch 'berkeley' of https://github.com/kheimerl/smqueue into berkeley

Conflicts:
	smqueue/Makefile.am