Merge branch '5-plugin-config' of https://github.com/HeatherHillers/Roam into 5-plugin-config

Conflicts:
	src/roam/mainwindow.py
Merge branch '5-plugin-config' of https://github.com/HeatherHillers/Roam into 5-plugin-config