Allow for more dynamic import extensions
Merge pull request #731 from sebmck/better-imports

Allow for more dynamic import extensions