Cross platform, please
Merge branch 'master' of github.com:karljs/dotfiles

Conflicts:
	.emacs