switched tabs to 2 spaces, reformatted, and some very minor tweaks
Merge branch 'master' of https://github.com/AssailantLF/dotfiles