rake rails:upgrade
unused test
switched to haml to test
add lock
merge rails_4 branch
rack cache gem