whitespace: newline at EOF .emacs.d/.gitignore
git: autosquash on rebase
ack: know puppet files
git: `git st` shows short status
zsh: load fewer oh-my-zsh plugins
emacs: init.el changes
git: restore some configs to their defaults

* merge instead of rebase
* include filename prefix in diff output
zsh: disable oh-my-zsh auto update
zsh: source boxen env
ack: sort .ackrc by types
hg: no longer using Mercurial
rvm: no longer using rvm
dotfiles: we aren't checked out as ~ anymore
irb: don't use Wirble anymore
zsh: source boxen's env after oh-my-zsh
zsh: comple…
emacs: remove marmalade; package manager included now
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