tweaks to scrolling to make it feel right in Andriod
Merge branch 'master' into lulo