Project realignment

Alright, time for the big daddy merge from project_realignment into unstable20.  Still no app templates, but those are next.  Let me know if you have any reservations, before I pull the trigger.