Ignore whole .idea directory and all .iml files.  It just ain't worth the hassle
Upgrade to Clojure 1.6.0
Ignore lein-repl-history
Merge branch 'master' of https://github.com/martinrist/clojure-sandbox

Conflicts:
	.gitignore