Removed genshi code. Moving to jinja2.
Added in untracked files