interim checkin
Merge branch 'master' of https://github.com/duncanchild/blockfilter.git

Conflicts:
	blockfilt/web/index.html