updated setup and switched to the user model
Merge branch 'master' of github.com:mturilin/akamaru

Conflicts:
	akamaru/workflow.py
	setup.py