Remove unnecessary test file (to prevent conflicts)
Remove youtube plugin from merge
Merge master into youtube