Moved win_makesymlinks.bat to simply win_makelinks.bat; Updated the batch for windows to backup/install configurations in a neater fashion; added various settings (including airline) to configurations; The rest is mostly line ending commits.
fixed merged conflicts