FIX for revert, and updates

Conflicts:
templates/node--audio.tpl.php
templates/node--video.tpl.php