Convert legacy tab indentation to spaces and remove trailing whitespace from all lines
Update History.md
Merge pull request #219 from Shopify/indent_and_trailing_ws_cleanup

Convert legacy tab indentation to spaces and remove trailing whitespace ...
Merge branch 'master' into dont_render_blank_blocks

Conflicts:
	lib/liquid/tags/cycle.rb
	lib/liquid/tags/increment.rb