Update to pull
Fix merge conflicts
Add code for VW classifier
Merge branch 'master' of https://github.com/karuiwu/reparse