Trying to get both my Datascience and Stormtrooper in sync.
Merge branch 'master' of https://github.com/Nectarineimp/mighty

Conflicts:
	resources/settings.clj
	src/mighty/dcoref.clj