Add spaces_after_conditional ruler, refs #91.
Merge branch 'space-after-conditional-keyword' of git://github.com/acrmp/tailor into acrmp-space-after-conditional-keyword
Changed some spacing
Merge branch 'master' of https://github.com/turboladen/tailor

Conflicts:
	lib/tailor/cli/options.rb