Do not reset options when calling highlight
Merge branch 'master' of https://github.com/zilverline/linguist into mergepullrequests