moved all changes from minimal branch

jade and stylus