don't use clojure keywords as variable names, it hides when they are not defined
Merge branch 'master' of github.com:timothypratley/finstrat

Conflicts:
	src/finstrat/portfolio.clj
	src/finstrat/simulations.clj