added backups to .gitignore
Merge branch 'master' of https://github.com/dsisnero/.emacs24.d

Conflicts:
	.gitignore