Upgraded to latest non-3 version of RSpec.
Updated CPK gem
Updated dalli store.
Updated Haml
Updated json gem.
Updated mysql gem (whoa), and commented the bejesus out of the Gemfile.
Merge branch 'master' into data_by_clade