Fix for capture_haml and blocks that return nothing

Resolves #694

Conflicts:
	lib/haml/helpers.rb
	lib/haml/helpers/action_view_mods.rb
Bump version
Merge branch 'stable'

Conflicts:
	CHANGELOG.md
	lib/haml/helpers.rb
	lib/haml/version.rb