Only run master assoication if requested
Add job startup to setup script