Update vagrant configuration
Merge branch 'master' into real_triples