More formatting fixes, .gitignore update, PHP update to 5.4