Added ocaml support, modularized puppet
Started using official image of trusty, added more memory and processors to box