Skittles hates me
Merge pull request #1021 from jdalphon/degem-bootstrap

Skittles hates me
Fixed users show page. Removed coffescript thats not nessicary since Jims changes.
I accidently a line
Merge branch 'master' of http://github.com/isenseDev/rSENSE into HM_User_Page
Gemfile.lock was out of date for some reason?
Merge pull request #1022 from hmcq6/HM_User_Page

Hm user page
Merge branch 'master' of git://github.com/isenseDev/rSENSE into trying_to_release
Adressing 1016
Addresses 1016, this was working. Skittles broke it