Changes from Kay's run through
Merge branch 'master' of https://github.com/jmcooper/angular-hogwarts-tdd-kata