freeagent config
removed some more plugins
fix merge conflicts
fix merge conflicts