converts MEDIA_BUNDLES into a dictionary
remove dev_names thing for MEDIA_DEV_MODE
Merge branch 'master' of github.com:c2h5oh/django-mediagenerator

Conflicts:
	setup.py