slate: try more options for layout.
emacs: Customized input method.
Merge branch 'master' of github.com:pnkfelix/DotFiles

Conflicts:
	emacs