upgrade to rails 3.2.10 and restructured the Gemfile a bit