Merge pull request #1 from krobertson/master

Instrument initial setup of a new slave and better handling for promotion
Instrument removal of the initial data directory