bitset
Merge branch 'master' of https://github.com/warelab/snapdragon

Conflicts:
	src/kmerizer/kmerizer.cpp
fixing my gitmess