merging...
my latest emacs configuration

Conflicts:
	.gitignore
general cleanup
remove a few things that are built into prelude now
fix some cider things
temporary work-around for clojure-mode/184
cleanup for windows and platform specific stuff
enable set-goal-column
temporary workaround for cider problem
fix somethings broken in darwin customizations
get rid of some packages prelude already gets
get rid of temporary hack for cider-mode
add optional loading of cider-inspect
some global settings
add cider-inspect
theme customization
fix ~/src paths and mu4e
start using textuml and don't use nrepl if not bound
add htmlize to packages to install
add plantuml jar and a few more things to get it working

Conflicts:
	personal/custom.el