Added process and preprocess hooks, as well as the theme hook.
merged master in to the branch