Cleaned up devise

Now need to work on getting the models and data to be tied to the
appropriate user