Need to figure out a way to ignore these database.yml file changes
merge complete
merged in with new edoWeb.war file for passing headers