Merge pull request #1 from jamesward/master

add a license
cleanup for activator 1.0