.gitignore logs
typo
Even better nil fixes.
Merge branch 'master' into deploy

Conflicts:
	.gitignore