Update and fixes from github

git-svn-id: https://plugins.svn.wordpress.org/networks-for-wordpress/trunk@786163 b8457f37-d9ea-0310-8a92-e5e31aec5664