Small fix in ImputeToTriTyperV2
Small update in Normalizer.java
Restore Changes made in TriTyperPedAndMapConverter after faulty merge
Restore Changes made in TriTyperPedAndMapConverter after faulty merge
Merge branch 'master' of https://github.com/molgenis/systemsgenetics.git
Merge pull request #144 from harmjanwestra/master

Small updates (and fix towards previously failed merge)