zsh: merge in latest .zshrc template
zsh: use "$ZSH/toolbear" for customizations
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
emacs: modularize with Cask and Boxed Wine
emacs: use Solarized Dark if available
emacs: style cursor to match Terminal.app
emacs: hide menu in terminal mode
emacs: fringe indicators
emacs: turn off line wrapping
emacs: puppet-mode
zsh: enable oh-my-zsh auto update