Do you mind if i pull in your fixes?

@adrilo I would like some of your fixes merged back. I also added hhvm as a build target in travis (which is failing now, as you know).