Merge pull request 11

Headings now use a @heading mixin