Updated show.html.erb, changed routes, updated user helper
Merge branch 'master' of git://github.com/NatElkins/iHava