from stash
conflict fix, version number..
Merge branch 'master' into mapBias
conflict resolved
Merge branch 'master' into mapBias
Merge branch 'master' into mapBias
Merge branch 'master' into mapBias
merge with master done
rm a swp file
Merge branch 'master' into mapBias

to keep in sync
new function frequency
new function inferAlleles
removed RUnit leftovers
two new complete and efficient inference methods
bump