ignore some files
Merge branch 'master' of github.com:bjoernd/dotfiles

Conflicts:
	emacs.d/.gitignore