Jail fixes for issue #12

Here's the revised fixes for this issue. I had to rework a couple of things as I did notice a bug with my previous code, in that it would show a wheel user no matter the shell type, so I got that fixed up as well.