progress on net.py and inclusion of pubnub
attempted fixes to subscribe
Merge branch 'master' of https://github.com/Supraluminal/MHacks2013TeamB9Server