Add Christof's tests and begin integration
Merged in some config tests from Christof
Merged in some config tests from Christof
Merge branch 'feature/add_christof_tests' of https://github.com/brettc/partitionfinder into feature/add_christof_tests
add more tests, now reading log output
Merge branch 'feature/add_christof_tests' of https://github.com/brettc/partitionfinder into feature/add_christof_tests

Conflicts:
	tests/cfg/test12.cfg
	tests/cfg/test13.cfg
	tests/cfg/test14.cfg
	tests/cfg/test15.cfg
	tests/cfg/test16.cfg
Merge branch 'feature/add_christof_tests' into develop