Merge pull request #869 from sanger/next_release

Collated Improvements
Puma shows poor performance alongside badly written controllers

Some of our controllers use ridiculously high memory requirements
In the face of these puma deteriorates significantly more than trinidad
Or at least its the change most likely to be responsible for this
Monkey patch after gem loading
Merge pull request #870 from JamesGlover/rollback_to_trinidad

Rollback to trinidad