9/8 again
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	csv/live graphing prices and volumes.csv
more screwup
Revert "more screwup"

This reverts commit 9b4fe60e43040165aa780103e26d8ebf4fa0e6b8.
Revert "Revert "more screwup""

This reverts commit fd96f79a24468c5bd74daa459837ed04a5a7f3b4.
fixing