Merge branch 'dev'
Merge branch 'dev'
Update README
Fix typo in _elements.scss
Clean up helper styles
Clean up example layout styles, fix typo in CSS comment block
Clean up functions
Add a couple of example modules
Release 1.2.1
Update README.md
Update README.md
Add v2 roadmap
Update README
Merge branch 'develop'
Merge branch 'release/2.0.0'

Conflicts:
	README.md
	style/scss/common/_elements.scss
	style/scss/common/_helpers.scss
	style/scss/components/_layout.scss
	style/scss/components/_module.scss
	style/scss/components/modules/_articles.scss
Fix font-stack inheritance issue
Update CHANGELOG
Update README.md
Switch compass config back to default config.rb
Merge branch 'master' into develop