Update the puppet config for apache, fix configuration filenames
New update APT::Default-Release to match new server version
Remove invalid TODO comments
Add puppet config for modifying ushahidi application directory permissions for cache and logs
Update puppet PHP config to enable display_errors by default, add php-defaults.erb
Reorganize php.pp package list alphabetically
Add php5-json to php.pp, as PHP5.5 no longer includes JSON by default