email address update

Signed-off-by: Adam McNicol <adam@mcnicol.me>
updated output

Signed-off-by: Adam McNicol <adam@mcnicol.me>
Merge branch 'production'

Signed-off-by: Adam McNicol <adam@mcnicol.me>

Conflicts:
	content/databases/01 - Introduction to Databases.md
	content/databases/02 - Data Model.md
	content/databases/03 - Inserting data.md
	content/databases/04 - Updating data.md
	content/databases/05 - Searching and sorting data.md
	content/databases/05b - Product Menu.md
	content/databases/06 - Introduction to relational databases.md
	content/databases/07 - Data Model Part 2.md
	content/databases/08 - Referential integrity.md
	content/databases/09 - Completing the coffee shop.md
	content/oop/01 - Introduction.md
	content/oop/02 - First Class.md
	content/oop/03 - Adding Methods.md
	content/oop/04 - Testing Class.md
	content/oop/05 - Inheritance and Polymorphism.md
	content/oop/06 - Animals.md
	content/oop/07 - Field.md
	content/oop/08 - Field Methods.md
	content/oop/09 - Field Management.md
	content/pyqt/00 - mac.md
	content/pyqt/00 - windows.md
	content/pyqt/01 - Introduction.md
	content/pyqt/02 - Crop Simulation.md
	content/pyqt/03 - Designing the user interface.md
	content/pyqt/04 - Layouts.md
	content/pyqt/05 - Radio Buttons.md
	content/pyqt/06 - Crop Selection Layout.md
	content/pyqt/07 - Switch layouts.md
	content/pyqt/08 - Automatic Grow.md
	content/pyqt/09 - Resources.md
	content/pyqt/10 - Summary.md
	content/pyqt/11 - Introduction.md
	content/pyqt/12 - Designing the interface.md
	content/pyqt/13 - Graphics Items.md
	content/pyqt/14 - Resource File.md
	content/pyqt/15 - Crop and Animal Items.md
	content/pyqt/16 - Field Scene.md
	content/pyqt/17 - Toolbars.md
	content/pyqt/18 - Event handling.md
	content/pyqt/19 - Drag Event.md
	content/pyqt/20 - Co-ordinates.md
	content/pyqt/21 - Context Menus.md
	content/pyqt/22 - Automatic Grow.md
	content/pyqt/23 - Manually Grow Field.md
	content/pyqt/24 - Field Report.md
	content/pyqt/25 - Summary.md
	content/pyqt/26 - Introduction.md
	content/pyqt/27 - Distributing on Mac OS X.md
	content/pyqt/28 - Distributing on Windows.md
	content/regular-expressions/01 - Introduction.md
	content/regular-expressions/02 - Further Syntax.md
	content/regular-expressions/03 - Key Terms.md
	content/regular-expressions/04 - RE and Python.md
	content/regular-expressions/05 - Server Side.md
	content/server-side-scripting/01 - Introduction.md
	content/server-side-scripting/02 - Getting Ready.md
	content/server-side-scripting/03 - Preparing Script.md
	content/server-side-scripting/04 - First Script.md
	content/server-side-scripting/05 - Capturing Data.md
	content/server-side-scripting/06 - Processing Data.md
	content/server-side-scripting/07 - Databases.md
	content/server-side-scripting/08 - Adding Data.md
	content/server-side-scripting/09 - Displaying Data.md
	content/server-side-scripting/10 - More HTML Forms.md
	content/server-side-scripting/11 - Pizza Kitchen.md
	content/server-side-scripting/12 - Pizza Kitchen Part 2.md
	content/server-side-scripting/13 - Pizza Kitchen Part 3.md
	content/server-side-scripting/14 - Pizza Kitchen Part 4.md
	content/server-side-scripting/15 - Pizza Kitchen Part 5.md