[WIP] Document six functions.
Fix travis-ci
Merge branch 'master' into cleanup