updated to havana
Merge branch 'master' of https://github.com/vexxhost/veta

Conflicts:
	veta/manager.py