Updated DB driver in deployment to JDBC
Fixed up JRuby gem configurations
Manual merge during sanger update
Merge remote-tracking branch 'sanger/master'