Cleaned up & fixed some TODOs
Merge branch 'master' of https://github.com/sidsen/vowpal_wabbit