added Xmodmap for Mac-like scrolling in x
merge