Use a better static file server
Merge branch 'master' into features/multi-keys

Conflicts:
	setup.py