Add fireplace, change clojure plugin
Merge branch 'master' of github.com:ilkka/dotfiles

* 'master' of github.com:ilkka/dotfiles:
  Add --short --branch to status alias