adding stuff to gitignore
Merge branch 'master' into nate