update ignores.
merging changes.

Merge branch 'master' of github.com:sakrejda/cruftery

Conflicts:
	.gitignore