erlang and php
Merge branch 'master' of https://github.com/webus/install_log

Conflicts:
	erlang_install.sh
	php_install.sh
Merge branch 'master' of https://github.com/webus/install_log
Merge branch 'master' of https://github.com/webus/install_log
Merge branch 'master' of https://github.com/webus/install_log
update emacs