Snapping/Scrolling behaviour MUCH better now.  

Cleaned up the snap to scrolling code and made it fell much better and always snap logically.