Logging proper error
Merge branch 'master' of github.com:heynemann/cyclops

Conflicts:
	cyclops/tasks.py
RElease 0.6.8