wording
Merge branch 'master' of github.com:comfy/comfortable-mexican-sofa
some tests for html/haml and file imports