Revising web programming chapter
Syndication in web programming chapter
Working on the image-based intro to Python
Added pages for upcoming UK boot camps
Minor tidy-up on web programming (still need to re-work starting point for example, but out of time)
Shell script outlines of lessons for Git
New page for American University of Beirut camp
Changed coordinates as per @wking's comment.
More notes about teaching Git
Updating web chapter, and fixing ID/link format
Merge branch 'master' of github.com:swcarpentry/website into book
Merge pull request #312 from gvwilson/master

Updating material for the instructors' guide.
Merge pull request #311 from amyrbrown/beirut-post

New page for American University of Beirut camp
Two more boot camps (Alberta and Massachusetts) in May
Merge pull request #308 from mikej888/master

Added pages for upcoming UK boot camps
Removed pages for boot camps which do not have definite dates
Merge pull request #314 from mikej888/master

Withdrew vague boot camp pages
Added the room number to the UC Davis bootcamp page
Merge pull request #315 from amyrbrown/ucd-room-num

Added the room number to the UC Davis bootcamp page
Boot camp at UWM