cleaned up user show page code

there is now an admin-show page and a regular show page.  the logic for this lives in the controller, and we no longer have to do hacky workaround with jquery and local variables.
cleaned up spacing
resolve merge conflict and clean up show page and partial to merge adam and zal's conflicting code