fix profile, add nrepl, emacs package stuff, etc.
Merge branch 'master' of github.com:adlaiff6/df

Conflicts:
	.emacs.d/init.el