Fixed problem with  and restored .gitignore to it's upstream content