Update ignore and add discovery...

Change-Id: I792b9e1d775b81ef7689eae460413d1bf6a8e4d4