Refactored client/friend helper functions (down to line 274)
Refactored DHT.c down to line 367
Refactored DHT.c down to line 567
Refactored DHT.c down to line 779
Refactored DHT.c down to line 881
Refactored DHT.c down to line 1048 (beginning of NAT)
Refactored DHT.c, all of NAT punching functions (line 1217
Refactored DHT.c from end of NAT punching to EOF
Merge branch 'master' into Jeffail-master

Conflicts:
	core/DHT.c
Merge branch 'master' into Jeffail-master
Merge branch 'master' into Jeffail-master
Fixed problems.
Time is better as an unsigned variable.
Merge branch 'Jeffail-master'