upgrades
updates
add the ruby racer
remove caching from development, update gems
remove cooltools group
resolve merge conflicts
merge conflict
cleanup
haml to erb
remove the backup gemset info
update gemset
update release doc
temporarily remove civic_commons.rb
re-add the config... but not like it was
restore civic_commons.rb
repair the schema, re-add the model thing to config
update compass rails
take gems out of assets group
use Redis for caching now
actually use the caching this time