Added Will Trimble to Tufts boot camp (and to metadata)
Merge pull request #530 from amyrbrown/add-will

Added Will Trimble to Tufts boot camp (and to metadata)
Blog post about Git vs. Subversion and why we need to collect feedback
Updating and consolidating setup instructions
python distribution notes, minor fixes
Merge pull request #4 from ahmadia/simplifying-setup-instructions

python distribution notes, minor fixes
Fixing minor typo
Merge branch 'simplifying-setup-instructions' of github.com:gvwilson/website into simplifying-setup-instructions
Merging changes from @ahmadia and fixing some typos
Removing the long-form 'journal' version of the blog
Merge pull request #535 from gvwilson/removing-blog-journal

Removing the long-form 'journal' version of the blog
Updating blog post to reflect feedback from @jiffyclub and others.
Merge pull request #531 from gvwilson/blog-git-vs-svn-feedback

Blog post about Git vs. Subversion and why we need to collect feedback
Merge pull request #534 from gvwilson/simplifying-setup-instructions

Updating and consolidating setup instructions
Updating the staffing for boot camps
Moving the setup instructions into the bootcamps directory (since there's now just one file)
Adding Charlene Nielsen to team
Merge pull request #540 from gvwilson/adding-charlene-nielsen

Adding Charlene Nielsen to team
Short mention of Science Careers article
Merge pull request #541 from gvwilson/blog-science-careers-article

Short mention of Science Careers article