Update .gitignore

Leaving out build folder now.  May fix our merge conflicts hopefully