Follower logic and networking code + merges

This merges Esteban's and Chun's branches (as of their work ~5 minutes ago; Esteban seems to still have some unpushed code), does some network upgrades, and *starts* on follower logic.