updated typos
changes to BEM naming syntax
Merge branch 'master' into gh-pages