clean up some of our hash code methods
Merge pull request #682 from candlepin/ckozak/hashcodes

clean up some of our hash code methods