Merge pull request #33 from bpearson/master

1. Do not override php_folding if already set.
1. Fixing variables to check the value not if it exists.
Merge remote-tracking branch 'upstream/master'