tree 206c2a017f4cc08075ad2cb2b0734a85240eee30
parent 07dbd01236f0a217ae63b90aec95d616dc012ecf
author Jon Hall <jhall@onlab.us> 1425518143 -0800
committer Jon Hall <jhall@onlab.us> 1425519117 -0800

Revert some accidental reverts

    Also fix some style errors
    Changed argument name in FlowAddedCount for clarity and avoid
        python buitin name conflict
    delete swap file