Merge pull request #24 from rod-hynes/master

Prototype version 0.6
Merge branch 'master' of github.com:Psiphon-Labs/ploggy