update to rails 3.2.11
merge Gemfile.lock