require logic less if option given
fix tilt errors
require new tilt
better html_safe tests copied from temple
Merge branch 'master' into smart-text

Conflicts:
	lib/slim/command.rb