Merge pull request #217 from goodfeli/master

small, miscellaneous