Metacomms 2.0

This one should be good, pulled in everything from #225 and fixed non-protobuff tests failing.