Merge tag '3.6.1' into develop

3.6.1
Add tox.ini for tox
.travis.yml: Add pypy
Merge pull request #133 from msabramo/travis_pypy

.travis.yml: Add pypy
Merge pull request #132 from msabramo/tox

Add tox.ini for tox
fix docstring bug 

The module docstring specifies the config file is at ~/.isort.conf but the code looks in ~/.isort.cfg, hence I spent a long time trying to figure out why my config file was silently being ignored!
Merge pull request #135 from wimglenn/develop

fix docstring bug
Add akcnowledgement for the awesome github users who have helped improve isort
Add test for desired behaviour
Fix test case
Update code to correctly concatenate multi line import strings
Fix test, adding new line after multi line imports
Fix isort to correctly wrap multi-line import statements
Only wrap single line statements for simplities sake
Remove undesired print statement
Merge pull request #136 from timothycrosley/feature/fix-issue-134

Feature/fix issue 134
Bump release to 3.6.2
Merge branch 'release/3.6.2'