Clean up the rabbit role

whitespace fixes, removing a name that didn't need to be there, fixed
some conditionals, etc..  Style conformity is good.
Merge pull request #561 from j2sol/rabbit-cleanup

Clean up the rabbit role