Handle paths with ..

When joining paths together, we need to normalize the result to not
include things like '..', '.', etc.
Convert SVG image links to data URLs
Merge branch 'master' into gh-pages