adding my own things
Merge branch 'master' of git://github.com/kjhealy/emacs-starter-kit
cleanup
fixed git link?
merged kjhealy
minor changes
Added dired-x, fixed my bib file
Merged kjhealy
Tweaks to merger