drop in latest code from google
add git ignore
update to latest code from gtm
Merge remote-tracking branch 'upstream/master'