Added deploy section to .travis.yml
Resolved conflicts!