- Specify terminal font the correct way
- Disable search_wrap
remove obsolete options
add git integration plugin
fix merge conflict