Add test for desired import * behavior going forward
Add combine-star setting
Update isort to more appropriatly handle star imports
Merge pull request #149 from timothycrosley/feature/fix-issue-145

Feature/fix issue 145