changed database yml
stuff
got edit working
merge conflicts