Last bit of comment infrastructure, hopefully
Merge branch 'master' of github.com:mgold/Normans-Ark