clean up keygen task
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from patrick-wright/master

clean up keygen task