cleanup for activator 1.0
Merge pull request #2 from jamesward/master

cleanup for activator 1.0