1.1.1 commit - fixes conditionals

git-svn-id: https://plugins.svn.wordpress.org/caldera-forms/trunk@959788 b8457f37-d9ea-0310-8a92-e5e31aec5664