Merged changes from gentoo-sci/sci
Updated .gitignore