Remove vars file in favour of the defaults one

Also fix deploy key name
Merge remote-tracking branch 'origin/master'