Merge branch 'master' of https://github.com/ataki/guacamole

Conflicts:
	aws/install_deps.sh
	logging.py
Merge branch 'master' of https://github.com/ataki/guacamole