alphabatize the .gitignore and make /s consistent
Merge pull request #435 from WyseNynja/alphabatize_gitignore

alphabatize the .gitignore and make /s consistent