git ignore and prep for merge from master