Clean up automator utils
Merge pull request #5 from urbanairship/MB-38

Clean up automator utils