ENH: to make two Michaels into one
BF: few missed import six from external
Merge pull request #145 from yarikoptic/master

ENH: to make two Michaels into one
Merge pull request #146 from yarikoptic/bf/six_imports

BF: few missed import six from external
BF: make some non-functioning doctests correct smoke tests
ENH: run nosetests with --with-doctest
Add a method parameter to corrplot
Flip the order of ax and method
Merge pull request #149 from Cynddl/feature-corr-methods

Add a method parameter to corrplot
Doc typo
Merge branch 'v0.3'
Merge pull request #147 from yarikoptic/bf/doctests

BF: make some non-functioning doctests correct smoke tests
Fix new pep8 rules
Merge pull request #152 from mwaskom/fix_new_pep8

Fix new pep8 rules
ENH: run nosetests with --with-doctest
Merge pull request #147 from yarikoptic/bf/doctests

BF: make some non-functioning doctests correct smoke tests
Merge branch 'v0.3'
BF: few missed import six from external
Fix new pep8 rules
Merge branch 'v0.3'