Adds airline and nice config.
Fixes merge conflict.
Adds fugitive git wrapper.