modified rake task
attempt to resolve conflicts
added user table drop