Consolidate, whitespace, sorting
README notice: moved to dotfiles repo