Update .travis.yml
Update .travis.yml
update connect and express
Merge branch 'develop' of github.com:ether/etherpad-lite into update-connect
Merge pull request #1739 from ether/update-connect

Update connect and express
catch error on export
Merge pull request #1743 from ether/dont-crash-on-export-abiword

catch error on export
Merge pull request #1745 from ether/master

Pull tags
Merge pull request #1746 from ether/develop

Bring in latest fixes.  No flow included, too much headache.