Removed the config dependency from the matrix generation classes.
Merge branch 'master' of https://github.com/ion599/phi

Conflicts:
	django_utils/config.template.py