initial commit
load user config
readme
better user.el
whitespace
add older, working version of ido-ubiq
Merge branch 'master' of github.com:flyingmachine/emacs-for-clojure
ok just commit the deps that work
add nrepl 2
fixing stuffs
remove old/irrelevant packages
updated with cider and a bunch of other stuff
add some stuff
Merge branch 'master' of https://github.com/terryfe/emacs.d

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents