Remerge all files
Fix travis deps
Add markdown deps
Merge pull request #355 from dblommesteijn/doc-pages

Doc pages (with travis fix)