Reduced memory requirements in test_lump.py
Reduced memory requirements for test_graph.py
Reduced memory requirements for test_hashbits.py
Fixed pep8 error in test_graph
Updated Changelog
cleaning up cppcheck violations for issue 506
Resolved conflic
more detailed ChangeLog entry
Edited Changelog
Corrected line too long in Changelog
Merge branch 'fix/506' of github.com:jlippi/khmer into jlippi-fix/506
Merge branch 'jlippi-fix/506'
Merge pull request #560 from leonorgg/fix/444

Fixes issue #444 in test_lump, test_hasbits and test_graph