Modified pusher client, added package json, consolidated feeds