Update .gitignore and untrack unneeded files

Change-Id: I7c8332444713c3021c6d5893a0d57f3ef0130c01