update conf
Merge branch 'master' of https://github.com/whitepages/WP_Deploy
fix config
Merge branch 'master' of https://github.com/whitepages/WP_Deploy
servers
Merge branch 'master' of https://github.com/whitepages/WP_Deploy
fixes