Small refactoring
Updated HaplotypeBuilder
Added options to search_variants.py