Bug fixes from @cfenzo and tested for Wordpress 3.9

git-svn-id: https://plugins.svn.wordpress.org/menu-override/trunk@896362 b8457f37-d9ea-0310-8a92-e5e31aec5664