Reintegration of iScroll