Remove Conflicts Between Caption and EditorCaption

Any duplicate properties, methods, etc are removed. This appears to have
fixed the emotion markup textbox.

EditorCaption is completely removed, as all of its unique properties
were implemented in Caption.