Add .ruby_version for use with rbenv
Merge branch 'master' into hop_grain_model_changes