More fixes for Etherpad
Merge pull request #52 from drybjed/etherpad-fix

More fixes for Etherpad