Upgrade to Ruby 2.0.0-p195
Updated bundle
Merge branch 'master' into pokedex