updated gitignore file
merging master and hopefully fixing it so I don't have to do this any more