Merge tag '3.4.1' into develop

3.4.1
Fix test to take into consideration more complex test cases
Update isort to handle more complex cases of data types intermixed in importing
Merge pull request #115 from timothycrosley/feature/improved-ordering

Feature/improved ordering
Bump version to 3.4.2
Merge branch 'release/3.4.2'