Merge my work so far to the main repository

all sorts of refactors.
preliminary proxy and cluster master