Some bug fixes and clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	gedcom-php-api-tests/tests/Functional/PersonTests.php