Adjust puma processes, do version bump.
Default to rails (thin) in Guardfile but allow means to override via environment variable.
Merge branch 'v6' into develop