Haikufinder as a submodule
Massive refactor
Can't invoke /usr/bin/python if you want to use virtualenv packages
Merge remote-tracking branch 'origin/master'