bashrc: increase history size to 10000
bashrc: add alias tp=trash-put
emacs: make ediff open window in same frame

ediff opens a navigation window as well as the windows showing the files
being diffed/merged. by default this window will be in a separate frame,
which I don't like very much. so force it to open the window in the same
frame instead.