Merge remote-tracking branch 'refs/remotes/origin/master' into 2.4.1

README.md

@@ -1,4 +1,4 @@
-<img src="http://assets.jacobwall.netdna-cdn.com/adsb-receiver_logo.png" width="468" height="110" />
+<img src="http://assets.jacobwall.netdna-cdn.com/adsb-receiver_logo.png" width="465" height="135" />
 
 # The ADS-B Receiver Project :airplane:
 
@@ -16,7 +16,6 @@ This repository contains a set of scripts and files which can be used to setup a
 * Informs visitors when specific flights are being tracked by dump1090.
 * Easily customize the look of your portal using the template system.
 
-
 **Web Portal Screenshots**
 
 ![dump1090 GIF](http://assets-jacobwall.netdna-ssl.com/adsbreceiver_readme.gif)
@@ -49,14 +48,14 @@ When setting up the portal you will have to choose between a lite or advanced in
 
 #### Updating existing installations...
 
+Your local repository will be updated each time install.sh is executed.
+
     cd ~/adsb-receiver
-    git fetch --all
-    git reset --hard origin/master
     ./install.sh
 
 #### Portal setup...
 
-This step pertains to both fresh installations as well as when updating and existing installation. After running the installation scripts you will need to setup the portal by visiting the following web address.
+This step pertains to both fresh installations as well as when updating an existing installation. After running the installation scripts you will need to setup the portal by visiting the following web address.
 
     http://<IP_ADDRESS_OF_YOUR_DEVICE>/install/
 
@@ -69,6 +68,7 @@ At this time the following software can be installed using these scripts.
 **Decoders**
 
 * Dump1090 (mutability):  https://github.com/mutability/dump1090
+* Dump1090 (FlightAware): https://github.com/flightaware/dump1090
 * Dump978:                https://github.com/mutability/dump978
 
 **Site Feeders**