Fix golint if/else
Fix golint if/else

if block ends with a return statement, so drop this else and outdent its block

kinvolk/scope,kinvolk/scope,kinvolk/scope,weaveworks/scope,kinvolk/scope,weaveworks/scope,alban/scope,alban/scope,alban/scope,weaveworks/scope,kinvolk/scope,kinvolk/scope,weaveworks/scope,alban/scope,alban/scope,weaveworks/scope,weaveworks/scope,alban/scope