updating gems
updated gems
dealing with some deprecation warnings
shop specs fixed
shop controller
rspec 2->3
Merge pull request #23 from bbttxu/gems

Gems