Merge pull request #6 from RPi-Distro/master

Merge upstream

README.md

@@ -277,13 +277,13 @@ maintenance and allows for more easy customization.
    enhancements, etc.  This is a base desktop system, with some development
    tools installed.
 
- - **Stage 4** - Normal Raspbian image. System meant to fit on a 4GB card.  More development
+ - **Stage 4** - Normal Raspbian image. System meant to fit on a 4GB card. This is the
-   tools, an email client, learning tools like Scratch, specialized packages
+   stage that installs most things that make Raspbian friendly to new
-   like sonic-pi, system documentation, office productivity, etc.  This is the
+   users like system documentation.
-   stage that installs all of the things that make Raspbian friendly to new
-   users.
 
- - **Stage 5** - The Raspbian Full image.
+ - **Stage 5** - The Raspbian Full image. More development
+   tools, an email client, learning tools like Scratch, specialized packages
+   like sonic-pi, office productivity, etc.  
 
 ### Stage specification
 

stage4/00-install-packages/00-packages

@@ -18,7 +18,6 @@ python-spidev python3-spidev
 python-twython python3-twython
 python-smbus python3-smbus
 python-flask python3-flask
-python-picraft python3-picraft
 pprompt
 piwiz
 rp-prefapps

stage5/00-install-extras/00-packages

@@ -3,7 +3,7 @@ sonic-pi
 scratch nuscratch scratch2 scratch3
 smartsim
 
-minecraft-pi python-minecraftpi
+minecraft-pi python-minecraftpi python-picraft python3-picraft
 python-sense-emu sense-emu-tools python-sense-emu-doc
 
 wolfram-engine