Updated to require 'yaml' in database.rb