Initial commit
Merge branch 'master' of github.com:kstarikov/emacs.d

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents
	elpa/better-defaults-0.1.2/better-defaults-autoloads.el
	elpa/better-defaults-0.1.2/better-defaults-pkg.elc
	elpa/better-defaults-0.1.2/better-defaults.elc
	elpa/cider-0.6.0/cider-autoloads.el
	elpa/cider-0.6.0/cider-client.elc
	elpa/cider-0.6.0/cider-eldoc.elc
	elpa/cider-0.6.0/cider-inspector.elc
	elpa/cider-0.6.0/cider-interaction.elc
	elpa/cider-0.6.0/cider-macroexpansion.elc
	elpa/cider-0.6.0/cider-mode.elc
	elpa/cider-0.6.0/cider-pkg.elc
	elpa/cider-0.6.0/cider-scratch.elc
	elpa/cider-0.6.0/cider-stacktrace.elc
	elpa/cider-0.6.0/cider-util.elc
	elpa/cider-0.6.0/nrepl-client.elc
	elpa/clojure-mode-2.1.1/clojure-mode-autoloads.el
	elpa/clojure-mode-2.1.1/clojure-mode-pkg.elc
	elpa/clojure-mode-2.1.1/clojure-mode.elc
	elpa/clojure-test-mode-3.0.0/clojure-test-mode-autoloads.el
	elpa/clojure-test-mode-3.0.0/clojure-test-mode-pkg.elc
	elpa/clojure-test-mode-3.0.0/clojure-test-mode.elc
	elpa/color-theme-6.6.1/color-theme-autoloads.el
	elpa/color-theme-6.6.1/color-theme-pkg.elc
	elpa/color-theme-6.6.1/color-theme.elc
	elpa/color-theme-actress-0.2.2/color-theme-actress-autoloads.el
	elpa/color-theme-actress-0.2.2/color-theme-actress-pkg.elc
	elpa/color-theme-actress-0.2.2/color-theme-actress.elc
	elpa/color-theme-twilight-0.1/color-theme-twilight-autoloads.el
	elpa/color-theme-twilight-0.1/color-theme-twilight-pkg.elc
	elpa/color-theme-twilight-0.1/color-theme-twilight.elc
	elpa/dash-2.7.0/dash-autoloads.el
	elpa/dash-2.7.0/dash-pkg.elc
	elpa/dash-2.7.0/dash.elc
	elpa/epl-0.7/epl-autoloads.el
	elpa/epl-0.7/epl-pkg.elc
	elpa/epl-0.7/epl.elc
	elpa/pkg-info-0.5/pkg-info-autoloads.el
	elpa/pkg-info-0.5/pkg-info-pkg.elc
	init.el
	places