Refactor Gemfile
Update gems
Update rails to 3.2.13
Merge branch 'master' into dev (Update gems and rails)