diff --git a/README.md b/README.md
index 3eb6de745c..8576929f61 100644
--- a/README.md
+++ b/README.md
@@ -8,101 +8,109 @@
[![Coverity Scan Build Status](https://scan.coverity.com/projects/5331/badge.svg)](https://scan.coverity.com/projects/diydrones-ardupilot)
-### The ArduPilot project is made up of: ###
->>ArduCopter (or APM:Copter) : [code](https://github.com/ArduPilot/ardupilot/tree/master/ArduCopter), [wiki](http://ardupilot.org/copter/index.html)
+## The ArduPilot project is made up of: ##
->>ArduPlane (or APM:Plane) : [code](https://github.com/ArduPilot/ardupilot/tree/master/ArduPlane), [wiki](http://ardupilot.org/plane/index.html)
+- ArduCopter (or APM:Copter) : [code](https://github.com/ArduPilot/ardupilot/tree/master/ArduCopter), [wiki](http://ardupilot.org/copter/index.html)
->>ArduRover (or APMrover2) : [code](https://github.com/ArduPilot/ardupilot/tree/master/APMrover2), [wiki](http://ardupilot.org/rover/index.html)
+- ArduPlane (or APM:Plane) : [code](https://github.com/ArduPilot/ardupilot/tree/master/ArduPlane), [wiki](http://ardupilot.org/plane/index.html)
->>ArduSub (or APM:Sub) : [code](https://github.com/ArduPilot/ardupilot/tree/master/ArduSub), [wiki](http://ardusub.com/)
+- ArduRover (or APMrover2) : [code](https://github.com/ArduPilot/ardupilot/tree/master/APMrover2), [wiki](http://ardupilot.org/rover/index.html)
->>Antenna Tracker : [code](https://github.com/ArduPilot/ardupilot/tree/master/AntennaTracker), [wiki](http://ardupilot.org/antennatracker/index.html)
+- ArduSub (or APM:Sub) : [code](https://github.com/ArduPilot/ardupilot/tree/master/ArduSub), [wiki](http://ardusub.com/)
+- Antenna Tracker : [code](https://github.com/ArduPilot/ardupilot/tree/master/AntennaTracker), [wiki](http://ardupilot.org/antennatracker/index.html)
-### User Support & Discussion Forums ###
->>Support Forum: [http://discuss.ardupilot.org/](http://discuss.ardupilot.org/)
+## User Support & Discussion Forums ##
->>Community Site: [http://ardupilot.org](http://ardupilot.org)
+- Support Forum:
-### Developer Information ###
->>Github repository: [https://github.com/ArduPilot/ardupilot](https://github.com/ArduPilot/ardupilot)
+- Community Site:
->>Main developer wiki: [http://dev.ardupilot.org](http://dev.ardupilot.org)
+## Developer Information ##
->>Developer email group: drones-discuss@googlegroups.com
+- Github repository:
-### Contributors ###
->>[Github statistics](https://github.com/ArduPilot/ardupilot/graphs/contributors)
+- Main developer wiki:
-### How To Get Involved ###
->>The ArduPilot project is open source and we encourage participation and code contributions: [guidelines for contributors to the ardupilot codebase](http://dev.ardupilot.org/wiki/guidelines-for-contributors-to-the-apm-codebase)
+- Developer email group: drones-discuss@googlegroups.com
->>We have an active group of Beta Testers especially for ArduCopter to help us find bugs: [release procedures](http://dev.ardupilot.org/wiki/release-procedures)
+## Contributors ##
->>Desired Enhancements and Bugs can be posted to the [issues list](https://github.com/ArduPilot/ardupilot/issues).
+- [Github statistics](https://github.com/ArduPilot/ardupilot/graphs/contributors)
->>Helping other users with log analysis on [http://discuss.ardupilot.org/](http://discuss.ardupilot.org/) is always appreciated:
+## How To Get Involved ##
->>There is a group of wiki editors as well in case documentation is your thing: ardu-wiki-editors@googlegroups.com
+- The ArduPilot project is open source and we encourage participation and code contributions: [guidelines for contributors to the ardupilot codebase](http://dev.ardupilot.org/wiki/guidelines-for-contributors-to-the-apm-codebase)
->>Developer discussions occur on drones-discuss@google-groups.com
+- We have an active group of Beta Testers especially for ArduCopter to help us find bugs: [release procedures](http://dev.ardupilot.org/wiki/release-procedures)
-### License ###
->>[Overview of license](http://dev.ardupilot.com/wiki/license-gplv3)
+- Desired Enhancements and Bugs can be posted to the [issues list](https://github.com/ArduPilot/ardupilot/issues).
->>[Full Text](https://github.com/ArduPilot/ardupilot/blob/master/COPYING.txt)
+- Helping other users with log analysis on [http://discuss.ardupilot.org/](http://discuss.ardupilot.org/) is always appreciated:
-### Maintainers ###
->> Ardupilot is comprised of several parts, vehicles and boards. The list below
->> contains the people that regularly contribute to the project and are responsible
->> for reviewing patches on their specific area. See [CONTRIBUTING.md](.github/CONTRIBUTING.md)
->> for more information.
->>
->> - [Andrew Tridgell](https://github.com/tridge)
->> - ***Vehicle***: Plane, AntennaTracker
->> - ***Board***: APM1, APM2, Pixhawk, Pixhawk2, PixRacer
->> - [Randy Mackay](https://github.com/rmackay9)
->> - ***Vehicle***: Copter, AntennaTracker
->> - [Robert Lefebvre](https://github.com/R-Lefebvre)
->> - ***Vehicle***: TradHeli
->> - [Grant Morphett](https://github.com/gmorph):
->> - ***Vehicle***: Rover
->> - [Tom Pittenger](https://github.com/magicrub)
->> - ***Vehicle***: Plane
->> - [Paul Riseborough](https://github.com/priseborough)
->> - ***Subsystem***: AP_NavEKF2
->> - [Lucas De Marchi](https://github.com/lucasdemarchi)
->> - ***Subsystem***: Linux
->> - [Peter Barker](https://github.com/peterbarker)
->> - ***Subsystem***: DataFlash
->> - ***Subsystem***: Tools
->> - [Michael du Breuil](https://github.com/WickedShell)
->> - ***Subsystem***: GPS
->> - [Francisco Ferreira](https://github.com/oxinarf)
->> - ***Bug Master***
->> - [Matthias Badaire](https://github.com/badzz)
->> - ***Subsystem***: FRSky
->> - [Eugene Shamaev](https://github.com/EShamaev)
->> - ***Subsystem***: CAN bus
->> - ***Subsystem***: UAVCAN
->> - [Víctor Mayoral Vilches](https://github.com/vmayoral)
->> - ***Board***: PXF, Erle-Brain 2, PXFmini
->> - [Mirko Denecke](https://github.com/mirkix)
->> - ***Board***: BBBmini, BeagleBone Blue
->> - [Georgii Staroselskii](https://github.com/staroselskii)
->> - ***Board***: NavIO
->> - [Emile Castelnuovo](https://github.com/emilecastelnuovo)
->> - ***Board***: VRBrain
->> - [Julien BERAUD](https://github.com/jberaud)
->> - ***Board***: Bebop & Bebop 2
->> - [Pritam Ghanghas](https://github.com/pritamghanghas)
->> - ***Board***: Raspilot
->> - [Matt Lawrence](https://github.com/Pedals2Paddles)
->> - ***Vehicle***: 3DR Solo & Solo based vehicles
->> - [Gustavo José de Sousa](https://github.com/guludo)
->> - ***Subsystem***: Build system
->> - [Craig Elder](https://github.com/CraigElder)
->> - ***Administration***: ArduPilot Technical Community Manager
->> - [Jacob Walser](https://github.com/jaxxzer)
->> - ***Vehicle***: Sub
+- There is a group of wiki editors as well in case documentation is your thing:
+
+- Developer discussions occur on
+
+## License ##
+
+The ArduPilot project is licensed under the GNU General Public
+License, version 3.
+
+- [Overview of license](http://dev.ardupilot.com/wiki/license-gplv3)
+
+- [Full Text](https://github.com/ArduPilot/ardupilot/blob/master/COPYING.txt)
+
+## Maintainers ##
+
+Ardupilot is comprised of several parts, vehicles and boards. The list below
+contains the people that regularly contribute to the project and are responsible
+for reviewing patches on their specific area. See [CONTRIBUTING.md](.github/CONTRIBUTING.md) for more information.
+
+- [Andrew Tridgell](https://github.com/tridge)
+ - ***Vehicle***: Plane, AntennaTracker
+ - ***Board***: APM1, APM2, Pixhawk, Pixhawk2, PixRacer
+- [Randy Mackay](https://github.com/rmackay9)
+ - ***Vehicle***: Copter, AntennaTracker
+- [Robert Lefebvre](https://github.com/R-Lefebvre)
+ - ***Vehicle***: TradHeli
+- [Grant Morphett](https://github.com/gmorph):
+ - ***Vehicle***: Rover
+- [Tom Pittenger](https://github.com/magicrub)
+ - ***Vehicle***: Plane
+- [Paul Riseborough](https://github.com/priseborough)
+ - ***Subsystem***: AP_NavEKF2
+- [Lucas De Marchi](https://github.com/lucasdemarchi)
+ - ***Subsystem***: Linux
+- [Peter Barker](https://github.com/peterbarker)
+ - ***Subsystem***: DataFlash
+ - ***Subsystem***: Tools
+- [Michael du Breuil](https://github.com/WickedShell)
+ - ***Subsystem***: GPS
+- [Francisco Ferreira](https://github.com/oxinarf)
+ - ***Bug Master***
+- [Matthias Badaire](https://github.com/badzz)
+ - ***Subsystem***: FRSky
+- [Eugene Shamaev](https://github.com/EShamaev)
+ - ***Subsystem***: CAN bus
+ - ***Subsystem***: UAVCAN
+- [Víctor Mayoral Vilches](https://github.com/vmayoral)
+ - ***Board***: PXF, Erle-Brain 2, PXFmini
+- [Mirko Denecke](https://github.com/mirkix)
+ - ***Board***: BBBmini, BeagleBone Blue
+- [Georgii Staroselskii](https://github.com/staroselskii)
+ - ***Board***: NavIO
+- [Emile Castelnuovo](https://github.com/emilecastelnuovo)
+ - ***Board***: VRBrain
+- [Julien BERAUD](https://github.com/jberaud)
+ - ***Board***: Bebop & Bebop 2
+- [Pritam Ghanghas](https://github.com/pritamghanghas)
+ - ***Board***: Raspilot
+- [Matt Lawrence](https://github.com/Pedals2Paddles)
+ - ***Vehicle***: 3DR Solo & Solo based vehicles
+- [Gustavo José de Sousa](https://github.com/guludo)
+ - ***Subsystem***: Build system
+- [Craig Elder](https://github.com/CraigElder)
+ - ***Administration***: ArduPilot Technical Community Manager
+- [Jacob Walser](https://github.com/jaxxzer)
+ - ***Vehicle***: Sub