tweaks from code review
Merge branch 'win' of https://github.com/RussTedrake/drake into win