Merged with oaeproject/Hilary + Travis integration + fixed merge conflicts

Merged with the latest version of oaeproject/Hilary
Fixed the merge conflicts
Edited the travis.yml file