Fix adding adding CIDRs to IPSet
added pyflakes to test-requirements after travis ci borked
Merge pull request #85 from jmeridth/fix_looping_of_cidrs

Fix adding adding CIDRs to IPSet
Fixes #84

Rearchitects most of the IPAM logic to utilize much smaller locks, as
well as no superfluous iterative querying while an UPDATE lock is
active. After extensive testing with the suite that produced the
deadlocks earlier, we see no more deadlocks, and in fact the lock-step
mechnanism introduced seems to be working quite well so far.

Additionally, some tests were removed that no longer made sense, and
others were added to bring IPAM coverage back to 100%
Merge pull request #87 from Cerberus98/no_moar_deadlocks

Fixes #84