distribute setup
Merge branch 'dev'

* dev:
  distribute setup

Conflicts:
	setup.py