Merge pull request #194 from rrthomas/master

Fix some comment typos
Factor out master name validation