Feature msgpack

Fixed conflicts with msgpack PR from @onethumb locally and made a couple fixes, mainly cosmetic.