Merge pull request #2 from MediaBrowser/master

sync with mb
Merge pull request #3 from bigjohn322/testing

Merge pull request #2 from MediaBrowser/master