Improved keyboard scrolling and added merge indicator option
- Also improvements to OS scrollbar style handling
- Corrected keyboard handling in OS X 10.8