Added some tests to check for elements that look like media elements
Fixed conflict
Bump version to 0.2.5