Update notes for submitted changes

* Finalized merge.
* Merge branch 'master' into qmmm