v0.04
Merge branch 'master' into v0.04

Conflicts:
	d2pi/uploader.py
	d2pi/watching.py
Merge pull request #7 from GuoJing/v0.04

v0.04