Merge branch 'master' into slides

Author: jonathanrocher

README.md

@@ -9,11 +9,17 @@ In this workshop, we will learn to embed scientific tools into a robust
 scientific application that can scale from a tiny UI to a large platform. As an 
 example, attendees will build an image browser application (including 
 face-detection capabilities), allowing users to search through their pictures, 
-based on various criteria. We will start from a simple jupyter notebook and 
+based on various criteria. We will start from a simple python script and 
 progressively turn it into a complete application using Matplotlib and several 
 packages from the Enthought Tool Suite such as Traits, TraitsUI and Pyface. In 
 the process, attendees will learn how to design clean, maintainable and 
-scalable applications, and package them into an installer.
+scalable applications, and discuss sharing your tool with your users.
+
+Ultimately, we will be building fairly sofisticated application that allows 
+users to explore images on their machines and detect faces in them:
+
+![full app screenshot](pycasa_final.png)
+
 
 ## Set up instructions
 First step to set yourself up is to clone this repository