Merge pull request #40 from eileenmcnaughton/master

minor tidy ups
remove require_once calls