Merge mpmaster branch
 Add ntypat property to SiteCollection.
Merge remote-tracking branch 'mpmaster/master'
Cleanup.