Elizabeth Patitsas comments on python.html exercises
After conversation with Jon Udell, removing XML stuff from web chapter:
will use JSON for all examples instead.  This will free up space to talk
about other things (e.g., Google Fusion tables).
Command to display history graphically in Git
Adding an option to echo paths to the badge creation script
Issuing badges for new instructors
setup/terminal.html: Remove Cygwin reference from OS X instructions

Reported-by: Amy Brown <amyrhoda@gmail.com>
Merge pull request #347 from gvwilson/issue-badges-for-new-instructors

Issuing badges for new instructors.
Changing the way the possibly-failing import is handled.
Adding Alex Viana to the team roster
Merge pull request #354 from gvwilson/add-viana-to-team-page

Adding Alex Viana to the team roster
Merge pull request #349 from wking/os-x-no-cygwin

Remove reference to Cygwin under MacOS
Merge pull request #345 from gvwilson/book

Recent work on the instructor's guide.
Updated with final topics, link to GitHub README.md and my e-mail
Merge pull request #355 from mikej888/master

Updated to link to and be consistent with GitHub README.md
Adding pages for five more boot camps, fixing typo in name of another, and updating staffing page to match
Merge pull request #357 from gvwilson/adding-july-2013-bootcamps

Adding pages for five more boot camps
updated AUB, added KAUST bootcamp
wking's suggested fixes
Added link to repository page and removed information duplicated on that page
Merge pull request #359 from mikej888/master

Added link to repository page and removed information duplicated on that page