asd
Merge branch 'master' of https://github.com/nicholac/elitetrader

Conflicts:
	elitetrader/code/eliteData.py
Merge branch 'master' of https://github.com/nicholac/elitetrader
Merge branch 'master' of https://github.com/nicholac/elitetrader
Merge branch 'master' of https://github.com/nicholac/elitetrader
porting edits back from server