Merge pull request #244 from reaperhulk/less-loaders

Remove separate vector file loaders and replace with one