Fixing my emacs tweakotine
Merge branch 'master' of github.com:joelkuiper/dotfiles

* 'master' of github.com:joelkuiper/dotfiles:
  Fixing my emacs tweakotine

Conflicts:
	emacs