Update .gitignore to ignore certain files.
Merge branch 'master' of https://github.com/adh635/dotemacs

Conflicts:
	.gitignore
Something changed in custom file.
Merge branch 'master' of https://github.com/AndyHolt/dotemacs

Conflicts:
	.gitignore
	init/adh_custom.el