User routes

The user#show method now returns a hash that includes the student and
their submissions.  This new structure broke a controller test, this commit fixes that.