Add support for fixture modules
Merge ../sample-pfunit

Conflicts:
	Makefile