Backout non persistence of virtual folders.  Doesn't address the real issue.
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser