merging batches
Merge branch 'master' into wip-kmerizer

Conflicts:
	src/kmerizer/kmerizer.cpp
boost::bind errors remain
Cleaning up autoconf deps.
Minor fixes.