Merge branch 'state-machine' of github.com:danielkrizian/strategery into state-machine

Conflicts:
	R/backtest.R
redelete ATS.R