switch_to_puma
Remove Trinidad daemon gem
Override java proxy settings

Changes in jruby 1.7 include using jvm proxy defaults.
Unforunately it seems to ignore the noProxyHost settings.
If we overide the settings we can mimic the original
behaviour.
Override the Capybara Server and use in tests
Tweak script/server to use puma
Kill server threads with close
Puma 2.2.2
puma 2.3.3
Resolve merge conflicts
Fixe bulk sub features