Add test for issue #116
Add setting needed to support issue #116
Add support for combining as imports, with the rest of from imports
Merge pull request #124 from timothycrosley/feature/fix-issue-116

Feature/fix issue 116