Add some todo's
Removed preferred neighbors list (unnecessary)
Removed old implementation
Choked/Unchoked neighbors
Added one line of choke message code
Fixed merge conflicts