pulls out start and stop polling and adds bugfixes
fixes merge
Merge pull request #32 from pocket-gophers-2014/polling

Polling