Update README.markdown
Merge branch 'master' into sass-scanner