Tried to get a plugin installer working
Merge branch 'develop' into plugins
updates for out of date branch