More updates to local conservation paper
Merge branch 'master' of github.com:CamelliaDPG/Camellia
Fixed some references in local conservation paper