Merge pull request #2 from knifewine/master

fix 2 broken paging tests
cleanup imports and include 're' which was missed before
ignore error related to cassandra-6964 which is not a real problem.
Merge remote-tracking branch 'upstream/master'