add del
Merge branch 'master' of https://github.com/yucong/conductor
Merge branch 'dev'
Merge branch 'master' of github.com:yucong/conductor
change varnish host
change user password
add config file