CUL-DigitalServices/avocet-hilary — pull request #31 by Coenego (2014-05-01 14:29:45+00:00)
Title: 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