pep8 fixes and docstring addition
merge conflict resolved
Merge branch 'master' of https://github.com/jessecusack/emapex
Merge branch 'master' of https://github.com/jessecusack/emapex
Merge branch 'master' of https://github.com/jessecusack/emapex
optional plotting improved