Update from master
Minor brush ups
Merge branch 'chris-branch' of https://github.com/jladdjr/lord-of-the-rings into chris-branch
Minor tweaks