Merge branch 'feature-naming-scheme' into develop
Conflicts: Changelog kamaki/cli/commands/cyclades.py kamaki/cli/commands/network.py kamaki/cli/commands/pithos.py
This diff is collapsed.
Conflicts: Changelog kamaki/cli/commands/cyclades.py kamaki/cli/commands/network.py kamaki/cli/commands/pithos.py