Update w/ many changes

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