use virtualenv & installed khmer
update
switch to gedlab khmer
pre-merge
Merge remote-tracking branch 'gedlab/mrc-additions' into macmanes