Updated aliases.
Removed vim-bufferline.
Added merge.conflictstyle = diff3
Added some wildignores
Use softtabs
Updated Readme
Fix install.sh exiting when powerline isn't installed