Added conditional mysql socket path to php.ini
Merge remote-tracking branch 'origin'

Conflicts:
	templates/php.ini.erb
Revert "GD library not playing nice with FreeType, removed"

This reverts commit 6617ddb8e176ccbbdf5d9d974afbae1fdf6adf0a.