resync with telehash:master (15/11/14)

really must try to findout if there is a way to keep a fork continiously autosynced with original project while allowing me to keep working on the fork as in the end the fork should hopefully be moot