blotter push
Merge remote-tracking branch 'origin/master'

Conflicts:
	alephnull/algorithm.py
	alephnull/gens/tradesimulation.py