merge
Merge branch 'master' of github.com:nicolas-fricke/semmul2013-group1
switch for meronym use
to use meronyms only when no hyponyms are available, set use_meronym parameter in construct_searchtree call to false (see line 54 in pipeline.py)