Merge pull request #33 from avsm/master

Testing tweak to try out Travis
Merge pull request #34 from avsm/master

travis: use new PPA structure rather than building ocaml from source