I'd suggest dropping your eb50ef081a56187d5ab57a8b096d46935e90a39c commit, because:

* Ruby 1.9.3 is specified in Gemfile as of ab1b97d6c163d8c0befadcb1a1cd7b541e587d91.
* This isn't relevant to using ENV variables for configuration.
* Merging your branch will conflict because the Gemfile source has also been changed.