Updates gemfile and configures rspec
some merge needed
Merge branch 'master' of https://github.com/camilosad/Sistema_PWEB