Merge pull request #211 from eads/0.9-beta7

Minor fixes
Merge pull request #212 from eads/0.9-beta7

clean up spreadsheet cli copy
Merge pull request #214 from eads/0.9-beta7

handle 'bare' directories by adding index.html
Merge pull request #215 from eads/0.9-beta7

Handle merged cells