Update scripts

Conflicts:

	.gitignore