add rake tweeks
fix merge conflicts
fix db migrate issues, rename files for better practice