diff --git a/.gitignore b/.gitignore
index c9d328de..a3997f2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,10 @@ ccpp_framework
 ccs_config
 chem_proc
 cime
-share
-libraries
 components
+libraries
 manage_externals.log
+share
 src/dynamics/mpas/dycore
 src/physics/carma/base
 src/physics/clubb
@@ -15,18 +15,17 @@ src/physics/ncar_ccpp
 src/physics/silhs
 src/utils/history_output
 
-
 # Ignore compiled python
-buildnmlc
 *.pyc
+buildnmlc
 
 # Ignore test output
-test/unit/tmp
 test/include/*.mod
 test/include/*.o
+test/unit/tmp
 
 # Ignore editor temporaries and backups
+*.swp
 *~
 .#*
 \#*#
-*.swp