add gitignore entries
Merge branch 'master' into kettle-deployment

Conflicts:
	.gitignore