Chanproxy written for 7chan
Merge branch 'master' into chanproxy

Conflicts:
	npm-shrinkwrap.json
Development on chan proxies. Added 7chan support