doc
Merge pull request #652 from goodfeli/doc_and_cleanup

doc