History and gemspec

Conflicts:
	History.md
	liquid.gemspec