Edits for camera ready.
Merge branch 'master' of ssh://github.com/cyrus-/papers