Merge pull request #575 from letanure/master

updates gemfile & jquery