Merge pull request #176 from gvwilson/master

Syncing 3_0 and 4_0
Updating embedded calendar to follow http://software-carpentry.org/bootcamps.ics

I made a Google calendar on the admin@software-carpentry.org account that
follows our generated calendar file and switched the embedded calendar to
point to that. I also added some margin space to the bottom of the map div
to put some room between the map and calendar.

Signed-off-by: Matt Davis <jiffyclub@gmail.com>
Removing some items from the embedded calendar.

Specifically the title, print icon, and calendar list menu (since we have
just one calendar).

Signed-off-by: Matt Davis <jiffyclub@gmail.com>
Adding avatar image
A helpful note from Trevor King
.mailmap: Standardize identifiers for Cait, Jon, and Matt
Adding a link to the calendar feed below the embedded calendar.

I also added an swc-blue-bg class to swc.css that sets the background
color to SWC Blue. It can be used in conjunction with the Bootstrap label
class to make an SWC Blue label. And I updated the footer labels to use it.
about/team.html: Make CNERG reference a live URL

It currently looks like a broken Markdown link :p.
Merge pull request #179 from wking/cnerg-link

about/team.html: Make CNERG reference a live URL
Merge pull request #171 from jiffyclub/new-calendar

Updating embedded calendar to follow http://software-carpentry.org/bootcamps.ics
bootcamps/index.html: Add a 'calendar' ID to the calendar <p>

This allows more direct linking, e.g. from the root index.html.
Merge pull request #178 from wking/calendar-anchor

bootcamps/index.html: Add a 'calendar' ID to the calendar <p>
New boot camp (GEOMAR)
Updating instructions for running the Firefox SQLite Manager based on #184
Added rewrite rule to return HTTP 410 (gone) for /trackback URLs
Merge pull request #188 from pipitone/fix_185_gone_wordpress_urls

Fix for issue #185 - Added rewrite rule to return HTTP 410 (gone) for wordpress /trackback URLs
Two blog entries
Merge pull request #189 from gvwilson/master

Two blog entries...
Blog post about cold calls
Merge pull request #190 from gvwilson/master

Writing a blog post about cold-calling