Updated gitignore, prepping for merge with master