Merge branch 'master' of github.com:tedpearson/curator into CURATOR-102

This closes #4