Moved pre/post tasks into prepare & cleanup roles

Resolves #23