Updating ports for PgBouncer connection pooler
Updating service to be able to gracefully quit (finish all its processing) before quitting.  This is a fairly "quick" service, so the waiting should never really take a ton of time to handle properly.
Fixing command-line bugs
Fixing command-line bugs
Merge remote-tracking branch 'remotes/origin/develop'

Conflicts:
	vinz_clortho.py