un-pinned most libaries and added markupsafe
updated from HEAD