Fix Travis
Merged package.json