Add tmux configuration file. Upgrade boostrap script.

Make bootstrap script more user-friendly.
Add options for smarter vim search
Merge branch 'master' into osx