Removing ppa.
Adding qnap and edid.tv to ssh config.
Merge remote-tracking branch 'origin/master'