Adding Devise and doing some other cleanup