switch to ruby 1.9.3-p545
explicitly pull --ff-only from develop