PR & lint fixes
Merge pull request #37 from apiaryio/almad/prfixes

PR & lint fixes