Commented out irrelevant local conservation problems
Merge branch 'master' of github.com:CamelliaDPG/Camellia

Conflicts:
	docs/Truman/LocalConservation/paper/paper.pdf
Updates to local conservation paper
Merge branch 'master' of github.com:CamelliaDPG/Camellia