Prepping Postgres & JDBC stuff.
Merge branch 'upstream' of https://github.com/LordLampshade/GoPServer.git into upstream
Quick fix.