Add "condition" option
Merge branch 'master' of git://github.com/MidnightDesign/wysiwyg-module

Conflicts:
	lib/Midnight/Wysiwyg/View/Helper/Wysiwyg.php