Applying changes from MacKeeper/yql-tables.

And fixing the conflicts:
	.gitignore
	yahoo/finance/yahoo.finance.options.xml