Merge remote-tracking branch 'upstream/master'
adding in websocket_proxy vhost type
Merge branch 'master' of https://github.com/nagey/babushka-deps
updated default websocket proxy config