Add missing dependencies
Merge branch 'setup' of https://www.github.com/aelred/nab into setup

Conflicts:
	setup.py
Merge branch 'setup' of https://www.github.com/aelred/nab into setup
Merge branch 'setup' of https://www.github.com/aelred/nab into setup