Merge branch 'next'

* next: (39 commits)
  Rename the non-ascii test data csv file.
  Reduce the size of the non-ascii test data.
  Factor out running callbacks in the worker.
  Allow use of latest jquery-rails gem.
  Update the JBuilder dependency.
  Update Paperclip dependency.
  Update the delayed_job dependency.
  Update the coderay dependency.
  Update missed translation keys in the installed locale file.
  [TAV-499] Clean up timed out runs properly.
  Use the locale file for validation error message.
  Don't save translated run status message in the database.
  Change status message keys to match run states.
  [TAV-457] Add an overriding locale file to the dummy app.
  [TAV-457] Install the locale file in the install generator.
  [TAV-457] Add I18n file for run status messages.
  Add a worker test for failure within the post_run callback.
  Add a worker test for failure within the pre_run callback.
  Assert that there is a run failure messge on failure.
  Add a worker test for failure within the cancelled callback.
  ...
Add later rubies to the travis setup.
Simplified method of choosing which layout to use
Merge branch 'master' of github.com:myGrid/taverna-player
Force input data to be treated as binary initially.

This, I think, brings ruby 2.x inline with ruby 1.9. Input text is treated as
binary until saved out into a file, when it is saved as utf-8.
Add tests for small non-ascii/utf-8 values.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Simplified method of choosing which layout to use
Make the controller dependency chain more explicit.

TavernaPlayer::ApplicationController should subclass the host app
ApplicationController, not ActionController::Base. This is now more explicit for
Rails 3 and should work correctly for Rails 4 too; Rails 4 detects an erroneous
circular dependency without the explicit :: prefix.