Make pid dir configurable
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2

Conflicts:
	net/spread/Makefile
Update joyent and wip