Merge remote-tracking branch 'origin/master'
Add the asus EDID for future reference, otherwise the ASUS screen is fucked.