Tweaked git ignore
Minor cleanup
Refactored settings, made PHP 5.3 and PHP 5.4 configurable.