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
Merge branch 'master' into rails4

* master:
  Add tests for small non-ascii/utf-8 values.
  Force input data to be treated as binary initially.
Fudge string encodings (again) for activerecord.

This feels like such a hack but we have no choice. Forcing a string's encoding
to be utf-8 only works if ruby doesn't think that it is utf-8 to start with, so
we have to force it to be binary then force it back to utf-8.
Restore the delayed_job dependency version.