removing inline styles. fixing smart quotes
Merge branch 'issue-535'

Manually rebased against master and fixed the merge conflicts in tos.mustache.

Thanks @pdehaan!

fixes #535