Move things around to facilitate testing
Merge branch 'master' of github.com:dmuino/atlas-plugin