Re-enable searching of map files.
When fixing merge conflicts, always use vertical split.
Use newer cbatticon in tray.
Add travis shell setup.