Config deploy after Travis-CI
Resolve merge