add flattr and gittip buttons
v2.0.2
Don't update HTML output on exceptions
Merge remote-tracking branch 'upstream/master' into README_ja

Conflicts:
	README.md