Is there a way to completely disable Spaces in El Capitan?
I've found that if head to mission control and uncheck 'displays have different spaces', then logout/login you should be sweet. Worked for me anyways.