This squash should work now.
Merge pull request #630 from Bahkuh/master

Minor improvements
Code cleanups.
Code cleanups.
Code cleanups.

Fixed some tests.
Removed out of date videos.
Merge remote-tracking branch 'upstream/master' into cleanup_unix_time_id_eq_cpy_is_timeout

Conflicts:
	toxcore/net_crypto.c