Need a Gemfile.lock for deployment
Connection string for RabbitMQ, Use Core 1.2
Merge pull request #78 from llh1/rabbitmq_connection_string

Connection string for RabbitMQ, Use Core 1.2
manual merge the master branch
manually merged Gemfile.lock
Updated DB driver in deployment to JDBC
Fixed up JRuby gem configurations
Manual merge during sanger update
Merge remote-tracking branch 'sanger/master'
Merge and bump version number
Merge pull request #109 from llh1/master

Update master from development 1.0.3
Update lims-core version in the Gemfile
Merge pull request #110 from llh1/master

Use the right lims-core version
manual merge during update development
Merge remote-tracking branch 'sanger/master'
Merged from development 1.2.0.1.0
Update gemfile.lock
Update lims-core only in Gemfile.lock
Merge remote-tracking branch 'sanger/master'
Bump lims-core version number