Merge branch 'develop' into plugin_dev
getting plugins to play nicely together
Merge pull request #33 from yiendos/plugin_dev

Plugin dev