Merge pull request #135 from katyhuff/2013-01-chicago

added a reference to the swcarpentry.github chicago requirements page.
Merge branch 'master' of https://github.com/swcarpentry/website
Merge branch 'master' of https://github.com/swcarpentry/website
compile.py: Add URL entry to the iCalendar feed

From RFC 5545, section 3.8.4.6:

  Purpose: This property defines a Uniform Resource Locator (URL)
  associated with the iCalendar object.
  ...
  Description: This property may be used in a calendar component to
  convey a location where a more dynamic rendition of the calendar
  information associated with the calendar component can be found.
  This memo does not attempt to standardize the form of the URI, nor
  the format of the resource pointed to by the property value.

The RFC examples point to ifb (free or busy time) and ics (arbitrary
scheduling) files, but Jon Udell suggested we could use it for boot
camp homepages too:

On Thu, Dec 20, 2012 at 08:58:18PM +0000, Jon Udell wrote:
> The one thing I'd add would be to populate the URL property with the
> most specific URL for each event.

He suggested this in addition to our current DESCRIPTION:

On Thu, Dec 20, 2012 at 09:06:06PM +0000, Jon Udell wrote:
> I see that there are already per-event URLs provided as the
> DESCRIPTION. For what it's worth, from my POV it would make sense to
> also do this:
>
> URL:http://software-carpentry.org/bootcamps/2012-09-dafx.html
Makefile: fix book-book sub-make targets
Adding creator badge for Jason Montojo
Merge pull request #141 from gvwilson/badges

Adding creator badge for Jason Montojo.
minor edition (typos, phrasing and layout)
Moving badge description pages to match paths embedded in badge JSON
Merge pull request #144 from gvwilson/master

Moving badge description pages to match paths embedded in badge JSON.
New blog entry
Merge pull request #146 from gvwilson/master

New blog post about data management.
Merge pull request #140 from pipitone/master

Adding a bootcamp page for the CAMH bootcamp
Merge pull request #139 from wking/book-book

Makefile: fix book-book sub-make targets
Merge pull request #138 from wking/icalendar-url

compile.py: Add URL entry to the iCalendar feed
Adding code of conduct
Merge pull request #147 from gvwilson/master

Added code of conduct.
Blog post about our code of conduct
Merge pull request #148 from gvwilson/master

Blog post about our code of conduct.
improve the text, following comments by gvwilson

* h2 headers
* pre/code nesting
* unneeded code markup
* simple quotes