Reverts earlier fix for ytdl which should now be fixed by ytdl 2018.0…

…2.04

Check for socket timeout for yt-dl

Potential workaround for Just-Some-Bots#1469. Seems to work better than Just-Some-Bots@37db56e

Lazy fix issue with func import

Update 1.9.5_2 (Just-Some-Bots#390) (Just-Some-Bots#391)

Just-Some-Bots#390

Update 1.9.5_1 (Just-Some-Bots#338)

Merged develop into master