added ignore for emacs ~ files
more tile merging changes
try to consolidate scroll_left and scroll_right