Remove test/dev dependencies and update everything else.
Workaround a bug in Rails' inheritance scheme in dev mode
Merge branch 'simple_promotions'
Drop back to v0.6.0 of activerecord-postgres-hstore - v0.7.x introduces breaking changes.
Revert to v0.30 of the hstore gem and re-patch.
Actually require the store patch
Merging from master.