Merge branch 'master' of /Users/setten/PycharmProjects/abipy with conflicts.
added the residues to the scissor object,
moved the legend of the scissor plot to the lower right corner
merging
Merge branch 'master' of https://github.com/setten/abipy
merging
Merge remote-tracking branch 'matteos-abipy/master'
Merge remote-tracking branch 'matteos-abipy/master'
flows can now be executed with py3k
Begin migration to new taskmanager.yml
Finalize migration to new TaskManager
Merge branch 'master' of https://github.com/gmatteo/abipy
rapidfire --> rapid, singleshot --> single
Minor changes
add zenobe_manager.yml
Code cleanup
Upgrade to new version of pymatgen
circle.yml
Activate travis for develop
Upgrade setuptools
Try andconda