Improved slime for remote clojure + fixed projman for long filenames + added fast load for slime
Minor fixes
org mode improvements
added sample org file
Submodules
Corrected submodules directory
updated auto-complete module repository
Merge branch 'master' of github.com:bratarmin/.emacs.d
removed nognus
Ediff - show conflicted changes
Merge branch 'master' of github.com:bratarmin/.emacs.d
Small fixes
fix
Merge branch 'master' of github.com:bratarmin/.emacs.d

Conflicts:
	conf.d/main.el
	conf.d/mode-git.el
	conf.d/mode-org-remember.el
	conf.d/mode-slime.el
Merge branch 'master' of github.com:bratarmin/.emacs.d

Conflicts:
	.gitignore
	conf.d/main.el
	conf.d/mode-git.el
	conf.d/mode-org-remember.el
	conf.d/mode-slime.el