Merge branch 'master' of https://github.com/forrestv/p2pool

Conflicts:
	web-static
Merge branch 'master' of https://github.com/blixnood/p2pool