Various changes & bump Java version down to 6, so we can support servers that aren't running Java 7 (for whatever reason)