switch to cleaner swap and pop version
Merge pull request #2 from datasift/feature/pollerfeatures

Feature/pollerfeatures