Remove separate file loaders and replace with one

All tests updated to work with the new simplified loader
Merge pull request #244 from reaperhulk/less-loaders

Remove separate vector file loaders and replace with one