Updated gitignore to use new placeholder file for local.d folder.
Added PHP SSH2 support to base apache install.
Added additional ToDo items
Merge branch 'master' into oneiric