use dashes in package name and underscores in module names
Merge branch 'master' into ella

Conflicts:
	setup.py
PIL -> Pillow