Add includes directory if it's missing

This code will *almost* repair a missing site directory, except that it gets hung up if there is a missing includes directory. This change helps is more completely repair a broken site directory.
Merge pull request #1424 from cameroncf/patch-1

Add includes directory if it's missing