Fixed issue #502
Fixed issue #502
Merge branch 'fix/502' of github.com:RodPic/khmer into RodPic-fix/502
Merge branch 'RodPic-fix/502'
Should fix pip2 / make test issues
Should fix pip2 / make test issues
Update jenkins script with new install-dependencies target
Check if python2 is available
add g++ dependency
fix borked merge
remove linewrap
Fix formatting