update Makefile / setup.py
Merge branch 'developing' of github.com:expyriment/expyriment into developing

Conflicts:
	Makefile