done by st shell
Enable auto-complete in erlang-mode (closes #198)
Merge remote-tracking branch 'upstream/master'
done by st shell