Merge pull request #12 from bozcotty/ch8

Ch8.1 Some issues to work out with Pundit implementation.
After rebase ch8, still resolving tests now that pundit is in place