Fix merge error
first pass on extends (still more todo - see all the todos at the end of file
Merge branch 'master' of https://github.com/less/less-docs