Re-attempting 2.2
Merge pull request #1 from chrisjhelms/deadly_skills

Re-attempting 2.2