Speed up and clean matrix_norm: now accepts both Z and G

 On branch master
 Your branch is up-to-date with 'origin/master'.

 Changes to be committed:
	modified:   Tests/test_allocation_construct.py
	modified:   allocation_construct.py