Merge pull request #128 from apiaryio/pksunkara/refactor

ResourceParser refactor