Initial Rails 4 app so I can try it out as well :-)
Set local Ruby version to 2.0.0
Merge remote-tracking branch 'origin/master'