Small fixes, Add query for SSH keys
Merge branch 'master' of github.com:KiteOps/li3_hosting