Update .merlin

Signed-off-by: John Else <john.else@citrix.com>
Update .gitignore

Signed-off-by: John Else <john.else@citrix.com>