diff --git a/.gitignore b/.gitignore
index ec0f4539e9..4e9e16e366 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,26 @@
+*.bin
+*.d
+*.dll
+*.exe
+*.lst
+*.o
+*.obj
+*.px4
+*.pyc
+*.tlog
+*.tlog.raw
+*.zip
+.*.swo
+.*.swp
+.built
+.context
+.depend
+.directory
+.DS_Store
 .metadata/
-Tools/ArdupilotMegaPlanner/bin/Release/logs/
-ArduCopter/Debug/
-ArduCopter/dataflash.bin
-ArduCopter/eeprom.bin
-ArduCopter/test/*
-config.mk
-serialsent.raw
-CMakeFiles
-CMakeCache.txt
-cmake_install.cmake
-build
-dataflash.bin
-eeprom.bin
+.settings/
+.vagrant
+/tmp/*
 /Tools/ArdupilotMegaPlanner/3DRRadio/bin
 /Tools/ArdupilotMegaPlanner/3DRRadio/obj
 /Tools/ArdupilotMegaPlanner/APMPlannerXplanes/APMPlannerXplanes/Debug
@@ -19,40 +28,34 @@ eeprom.bin
 /Tools/ArdupilotMegaPlanner/bin/APM Planner.app
 /Tools/ArdupilotMegaPlanner/bin/Debug
 /Tools/ArdupilotMegaPlanner/bin/Release/gmapcache
+/Tools/ArdupilotMegaPlanner/bin/Release/logs/
 /Tools/ArdupilotMegaPlanner/CustomImages
 /Tools/ArdupilotMegaPlanner/Msi/upload.bat
 /Tools/ArdupilotMegaPlanner/obj
 /Tools/ArdupilotMegaPlanner/resedit/bin
 /Tools/ArdupilotMegaPlanner/resedit/obj
-/Tools/ArdupilotMegaPlanner/Updater/obj
 /Tools/ArdupilotMegaPlanner/Updater/bin
+/Tools/ArdupilotMegaPlanner/Updater/obj
 /Tools/ArdupilotMegaPlanner/wix/bin
 /Tools/ArdupilotMegaPlanner/wix/obj
 /Tools/autotest/ch7_mission.txt
-tags
-test.ArduCopter/*
-/tmp/*
-*.o
-.*.swp
-.*.swo
+ArduCopter/dataflash.bin
+ArduCopter/Debug/
+ArduCopter/eeprom.bin
+ArduCopter/test/*
+build
+Build.Arducopter/*
+cmake_install.cmake
+CMakeCache.txt
+CMakeFiles
+config.mk
+dataflash.bin
+eeprom.bin
+Make.dep
 mav.log
 mav.log.raw
+module.mk
+serialsent.raw
 status.txt
-*.exe
-*.dll
-*.obj
-*.zip
-*.pyc
-Make.dep
-.depend
-.built
-.context
-*.lst
-*.tlog
-.DS_Store
-.vagrant
-*.tlog.raw
-*.d
-*.px4
-.directory
-.settings/
+tags
+test.ArduCopter/*