erlang config
Merge branch 'master' of github.com:simon-rock/emacs_config

Conflicts:
	config/.emacs.d/elisp/sierlang.el

merge sierlang.erl