targetting 3.1.0 on master

atm users on hhvm-nightly doesn't get a "correct" version number for `hhvm --version`
Merge pull request #2306 from staabm/patch-1

targetting 3.1.0 on master