putting back the correct travis-ci connection settings, doc updates
Merge branch 'master' into gh-pages