added new formatting to fish
Merge branch 'master' of http://www.github.com/ccann/dotfiles
idk
Merge branch 'master' of github.com:ccann/dotfiles
started reorganizing init.el by moving portions into separate .el files; added lisp/