Merge branch 'dev'

* dev:
  distribute setup

Conflicts:
	setup.py
Merge branch 'dev'

* dev:
  Switch to docopt
Forgot to add docopt to setup.py
Move config to utils

Remove ini configs