Improves Gemfile and upgraded Rails to 3.2.13.rc2
Merged from master