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
added #defines for friend.status as well as for erroring on m_addfriend*
updated return value comments
Fixed a build error due to the removal of getnumfriends()
Merge pull request #269 from ragesalmon/master

Fixed a build error due to the removal of getnumfriends()
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
changing OSX instructions in INSTALL.md to reflect how everything works
removing useless files
Forgot the include to packages to grab for the non-homebrew steps
reverting unneeded changes