temporarily check in db/template changes; broken rspec (will not run)
all spec tests now pass