rake: Simplify deploy

* Simplify deploy and keep my local master branch in sync with the
  rmeote.