Fix canvas refresh bug and double plugin load post merge
Merge branch 'merge-master-plugins-config' of https://github.com/HeatherHillers/Roam into local-plugins-copy