Fixing broken link to FAQ
Merge pull request #289 from gvwilson/master

Fixing broken link to FAQ in bootcamps index page
Use media-objects rather than a table for the list of books.

- Fixes layout issues on the page (text was squashed against
  images)
- css > tables
Merge pull request #288 from pipitone/biblio-media-object

Use media-objects rather than a table for the list of books in about/biblio.html
Updating list of upcoming office hours.

- Removed eventbrite registration links, since no one is using them
1. Adding blog post about Macquarie boot camp.
2. Fixing typos in two recent blog posts.
Merge pull request #291 from gvwilson/blog

Blogging about Macquarie.
Merge branch 'master' of github.com:gvwilson/website into blog
Blog post about UBC boot camp
Blog post about UBC
Merge pull request #296 from gvwilson/master

Blog post about UBC boot camp
Blog post about reproducibility
Merge branch 'master' of github.com:swcarpentry/website into blog
Merge pull request #297 from gvwilson/master

Blog post about reproducible research not being compelling.