Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	zipline/finance/risk.py
	zipline/gens/tradesimulation.py
Merge branch 'master' into develop
Merge branch 'master' of https://github.com/Gusabi/zipline into develop