Merged input filters and WYSIWYG features and moved feature activation from dependencies to the correct function.