Synced up with htmlbars. Merged hooks and helpers files. Some re-naming.