Updated media component with fixes to issue#1

Squashed commit of the following:

commit 201f034465aecb994d6bebefa8194c679eec4657
Author: Chris Steele <chris.steele@kineo.com>
Date:   Wed Dec 11 14:08:46 2013 +0000

    clean up

commit 4899190b2deee7cda4609bb53716917d5b5684b8
Author: Chris Steele <chris.steele@kineo.com>
Date:   Wed Dec 11 13:46:52 2013 +0000

    various updates and restructure

commit 831cbffe3f3db585a4e7b46d9bd401086ade314c
Author: Chris Steele <chris.steele@kineo.com>
Date:   Wed Dec 11 11:49:36 2013 +0000

    test