Breaking up emacs
Merge branch 'master' of https://github.com/charlespittman/dot_files

Conflicts:
	emacs/emacs