Merge branch 'master' of https://github.com/florind/what-runs-where

Conflicts:
	README.md
	src/what_runs_where/views.clj
	test/what_runs_where/test/config-test.properties