Merge pull request #32 from rod-hynes/master

Bug fixes while testing controller
Meek session protocol v.2
Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core
Merge pull request #33 from efryntov/master

Meek session protocol v.2 in meekConn.go
Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core