Merge branch 'dev' of github.com:vanzaj/dacets into dev

* 'dev' of github.com:vanzaj/dacets:
  distribute setup

Conflicts:
	setup.py
Switch to docopt
Merge branch 'dev'

* dev:
  Switch to docopt