Added generic configure system for tests
Merge branch 'master' of github.com:jeaye/jeayeson

Conflicts:
	Makefile