tweaks
Merge branch 'master' of github.com:jzawodn/dotfiles

Conflicts:
	.emacs