Add keys for use in diff mode
Add some additional configuration options
Enable wildmenu and some style changes