diff --git a/.gitignore b/.gitignore
index 6758febbd2..e97592dbe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,84 +1,84 @@
-*~
+/.lock-waf*
+/.waf*
+/Tools/autotest/aircraft/Rascal/reset.xml
+/Tools/autotest/ch7_mission.txt
+/Tools/autotest/jsb_sim/fgout.xml
+/Tools/autotest/jsb_sim/rascal_test.xml
+/Tools/autotest/jsbsim_fgout_0.xml
+/Tools/autotest/jsbsim_start_0.xml
+/tmp/*
 *.bin
 *.d
+*.dfu
 *.dll
 *.elf
-*.hex
-*.dfu
 *.exe
+*.generated.h
+*.hex
 *.lst
 *.o
 *.obj
 *.px4
-*.vrx
 *.pyc
 *.tlog
 *.tlog.raw
 *.vbrain
+*.vrx
 *.zip
+*~
 .*.swo
 .*.swp
+.DS_Store
+.autotools
 .built
 .context
 .cproject
 .depend
 .directory
-.DS_Store
 .metadata/
 .project
 .settings/
-.autotools
-.vagrant
 .tags
 .tags_sorted_by_file
-logs/
-terrain/
-/.lock-waf*
-/.waf*
-/tmp/*
-/Tools/autotest/ch7_mission.txt
-/Tools/autotest/aircraft/Rascal/reset.xml
-/Tools/autotest/jsbsim_fgout_0.xml
-/Tools/autotest/jsbsim_start_0.xml
-/Tools/autotest/jsb_sim/fgout.xml
-/Tools/autotest/jsb_sim/rascal_test.xml
+.vagrant
+APMrover2/test.APMrover2/
+APMrover2/way.txt
 ArduCopter/Debug/
-ArduCopter/test.ArduCopter/
-ArduCopter/test/*
 ArduCopter/fence.txt
 ArduCopter/ral.txt
+ArduCopter/test.ArduCopter/
+ArduCopter/test/*
 ArduCopter/way.txt
-ArduPlane/test/*
 ArduPlane/test.ArduPlane/
+ArduPlane/test/*
 ArduPlane/way.txt
-APMrover2/way.txt
-APMrover2/test.APMrover2/
-mk/PX4/ROMFS/default.parm
-autotest.lck
-build
-Build.ArduCopter/*
-Build.ArduPlane/*
 Build.APMrover2/*
 Build.AntennaTracker/*
-cmake_install.cmake
+Build.ArduCopter/*
+Build.ArduPlane/*
 CMakeCache.txt
 CMakeFiles
+LASTLOG.TXT
+Make.dep
+Thumbs.db
+autotest.lck
+build
+cmake_install.cmake
 config.mk
+cscope.in.out
+cscope.out
+cscope.po.out
 dataflash.bin
 eeprom.bin
 index.html
-LASTLOG.TXT
-Make.dep
+logs/
 mav.log
 mav.log.raw
 mav.parm
+mk/PX4/ROMFS/default.parm
 module.mk
 serialsent.raw
 status.txt
 tags
+terrain/
 test.ArduCopter/*
-Thumbs.db
-cscope.in.out
-cscope.out
-cscope.po.out
-*.generated.h