Merge branch 'master' of https://github.com/ataki/guacamole
Adding command line support.
Merge branch 'master' of https://github.com/ataki/guacamole