Revert "Merge branch 'gitignore'"

This reverts commit 1caebf23493d877bca94c8b33c6858af8c3930ab, reversing
changes made to 2d531eb3e1a86c12cd91d656156af525335eabfc.

Conflicts:
	.gitignore