Limited memory use
Merge remote-tracking branch 'benlaurie/master'
Added test case for contracting K internally - failed
Merge remote-tracking branch 'benlaurie/master'

Conflicts:
	test.cc
Implemented increasing cutoff

Conflicts:
	tensor.h
	trg-s3.cc
Merge remote-tracking branch 'felix/master'