Pulling changes from danhsh/yql-tables.

And fixing conflicts:
	yahoo/finance/yahoo.finance.stocks.xml