more minor refactoring
Merge branch 'master' of github.com:JohnLangford/vowpal_wabbit