Adding hide-show key.
Merge branch 'master' of https://github.com/charlespittman/dot_files

Conflicts:
	emacs.d/elisp/keys.el