Trying out helm, and disabling a bunch of stuff that doesn't want to
compile.
Merge branch 'master' of https://github.com/charlespittman/dot_files

Conflicts:
	emacs/emacs