scrolling
add leiningen profile
path changes
Merge branch 'master' into emacs24.4

Conflicts:
	emacs.d/.smex-items
	emacs.d/elpa/archives/gnu/archive-contents
	emacs.d/elpa/archives/marmalade/archive-contents
	emacs.d/elpa/archives/melpa-stable/archive-contents
	emacs.d/places
	emacs.d/user.el
make run on bigdaddy
updated packages to unstable
solved woes with evil mode. Thank god