Minor refactoring to have a cleaner circle.yml
Merge branch 'feature/module' of github.com:andresriancho/w3af into feature/module

Conflicts:
	circle.yml
	w3af/core/controllers/ci/install_core_dependencies.sh