Updated gitignore, preparing to merge with master...