Sorted options to force deterministic ordering of options i.e. each run would cause a refresh of the mailcatcher service.
Added todo item.
Fixed mailcatcher upstart issue.