Merge the dialplan_aesthetics branch. Most of this patch simply converts applications