.emacs file created on site
.emacs file I've had forever
Merge remote-tracking branch 'origin/historic'

Big mashup of historic Emacs customizations with a newer file started from
scratch.
Some additions to .emacs
a .gitconfig
emacs key bindings for git aliases
slime+quicklisp and magit customization
Merge remote-tracking branch 'dotfiles/master'
Turn into a real .emacs directory

Move emacs to init.el, add .gitignore