(TravisCI) Sneak in a travis fixeroo
Merge branch 'master' of http://github.com/oaeproject/Hilary