Changed column names and associated calls throughout application (#215 users table)
Added dropdown menu for setting user type on new and update forms and fixed db/schema.rb
Fixed bug with importing users, made user-friendly redirect message if accidentally accessing the imported page directly
Removed assign_type method and calls, fixed typo in ImportUsersController#import
Updated Users factory and model spec to accommodate changes to column names
Consolidated is_admin_in_XYZmode? methods into one with a parameter and updated spec
Updated migrations of Users table to copy over existing data during migration
address comments in 415 pull request, deleted method / view from app_setup (controller/view), fixed migration issue where .each was called on User class.
cleaned up terms_of_service view
fixed merge conflict in db/schema.rb
Merge pull request #410 from YaleSTC/215_Simplify_Users_Table

215 simplify users table