Remove options from backup.py (now in settings.py)
Merge branch 'master' of https://github.com/bouttier/backup

Conflicts:
	backup.py