newline at EOF
git: autosquash on rebase
ack knows about puppet files now
git st alias is short status
load fewer oh-my-zsh plugins
emacs init.el changes
Restore some git configs to their defaults

* merge instead of rebase
* include filename prefix in diff output
disable auto update
source boxen env for zsh
sort .ackrc by type
don't use Mercurial anymore
no longer using rvm
repo isn't checked out as ~ anymore
don't use Wirble with irb anymore
emacs: remove marmalade; package manager included now
emacs: remove noop custom-set-faces
emacs: remove Solarized for now

Will restore it when theme installation is managed with boxen.
emacs: switch to Source Code Pro typeface

...and only set font when run as Emacs.app.
emacs: start server automatically
emacs: modularize