Reorganized infinite dmrg stuff to be more object oriented.
Merge branch 'master' of https://github.com/JHappyface/DMRG

Conflicts:
	src/dmrg.cpp