get rid of old sitting stuff and simplify jade templates
update deploy