Indent settings for css and html
Merge branch 'master' into macosx