Merge branch 'master' of github.com:a-scourge/dotfiles

Just having to merge because of the README