Merge branch 'gh-13'

Conflicts:
	tumblr_backup.py