Clean up comments
Use job control consistently, rather than mixing with $subshell and pkill
Move top-level trap after starting app server, so it can receive SIGTERM on dyno shutdown
Merge branch 'fix-app-sigterm' into develop

Conflicts:
	bin/start-pgbouncer-stunnel