Merge pull request #155 from scopatz/master

License update
Blog post about Computer Science Curriculum 2013
Merge pull request #160 from gvwilson/master

Adding another blog post
computer-science-curricula-2013: fix "best" -> "beast" typo
Merge pull request #164 from wking/curricula-typo

computer-science-curricula-2013: fix "best" -> "beast" typo
bootcamps: Add latlng metadata to several bootcamps

I don't have any personal connection to these boot camps, so I mostly
used the location of the hosting university.  Some of these boot camps
actually list addresses (e.g. 2013-01-CAMH) or link to pages that do
(e.g. 2013-02-amos), and I used that location to get more accurate
coordinates where possible.
bootcamps/index.html: Auto-generate Google Map using JavaScript

Use the Google Maps' v3 JavaScript API [1] to automatically construct a
map of boot camp locations.  This commit translates work by Matt Davis
and me on an initial Jekyll-based implementation over to Jinja.  Matt's
commits are [2]:

  commit 68931d42b1b0b8f145f912f86692f1793b4a55f3
  Author: Matt Davis <jiffyclub@gmail.com>
  Date:   Tue Dec 11 21:36:39 2012 -0500

    Reformatting the the map info windows for readability.

and [3]:

  commit ebe218697314c04de9fd9e35012b013bedb488b5
  Author: Matt Davis <jiffyclub@gmail.com>
  Date:   Tue Dec 11 18:19:56 2012 -0500

    Adding an info window to map pins when they are clicked. Includes
    the venue, date, and a link to the boot camp page.

[1]: https://developers.google.com/maps/documentation/javascript/
[2]: https://github.com/wking/boot-camps/commit/68931d42b1b0b8f145f912f86692f1793b4a55f3
[3]: https://github.com/wking/boot-camps/commit/ebe218697314c04de9fd9e35012b013bedb488b5
Merge pull request #165 from wking/bootcamp-latlng

bootcamps: Add latlng metadata to several bootcamps
Merge pull request #21 from wking/google-map

Write program to sync the Google Map and Google Calendar with actual workshop data
A simpler solution to getting excerpts for blog posts right.
Merge pull request #166 from gvwilson/master

Expanding template variables in blog post excerpts in blog/index.html.
This closes #159.
Changing Google Analytics account to admin@software-carpentry.org
Merge pull request #167 from gvwilson/master

Starting to consolidate accounts
compile.py: Remove date from iCalendar SUMMARY

Reported by Matt Davis:

On Sat, Dec 29, 2012 at 08:18:13PM -0800, Matt wrote:
> The events in http://software-carpentry.org/bootcamps.ics have the
> date in their `SUMMARY` field, e.g. `SUMMARY:University of Oslo\,
> Sep 17-18\, 2012`. The summary field is used in the embedded Google
> calendar and the date adds a lot of text and makes it look
> crowded. This is on a calendar so it shouldn't be necessary to
> repeat the date in the summary.
Merge pull request #169 from wking/calendar-no-dates

Remove dates from calendar event summaries
Putting an image on the home page and using multi-column layout
Merge pull request #170 from gvwilson/master

Making home page a little more attractive
bootcamps/index.html: Fix 'experience..' typo
Merge pull request #172 from wking/experience-typo

bootcamps/index.html: Fix 'experience..' typo
Removing CSS 'blueprint' package