Merge branch 'release/v2.1.0' into develop
fixed headings mixin due to problems with compass
bumped up version numbers
Merge branch 'release/v2.1.1'