Clean up/format code
initialize num_requests
Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master

Conflicts:
	testing/nTox.c