Revert "formatting clean up; astyle -A10"

This reverts commit 5ff515299af9bba8a085697dad65ed6ccd915202.
Merge branch 'master' into feature/hll-counter

Conflicts:
	khmer/_khmermodule.cc
Move test_Hashbits to test_hashbits_obj, case sensitive filesystems complains a lot about this (I'm looking at you, OSX)
Merge pull request #265 from ged-lab/fix/test_hashbits_case

Fix test_Hashbits case sensitivity
Merge branch 'master' into feature/hll-counter