update Wapiti to 1.5

Hi @adsva,

Wapiti was recently updated to 1.5 (with a couple of bugs fixed). In this PR I updated the submodule to use this updated Wapiti. Also there is a small unrelated change to setup.py.

Could you please make a pypi release?