Fixing up various merge bugs, such as user -> users controller