Merge branch 'master' of github.com:JohnLangford/vowpal_wabbit into txm
Merge branch 'txm' of github.com:JohnLangford/vowpal_wabbit into txm
many small tweaks