Merge branch 'upgrade_everyone_to_postgres_9.5' of https://github.com/tgxworld/discou...