Fixes for VIP loading the theme before plugins

git-svn-id: https://plugins.svn.wordpress.org/narrative/trunk@982305 b8457f37-d9ea-0310-8a92-e5e31aec5664