Bugfix - show_on broken in merge
Merge branch 'master' of github.com:humanmade/Custom-Meta-Boxes into dev

Conflicts:
	class.cmb-meta-box.php