Non feature branches

I don't really like having is_non_feature_branch and is_feature_branch when they're aren't opposites. I'm leaning towards changing the variable from "non_feature_branch_names" to "additional_non_feature_branch_names" as thats what they really are since we already have master as a non-feature branch.