Update after merging PRs #39, #44, #47, #38, #51, #53, #54

@pengwynn, would you review this before I merge? I would prefer not to break the site my first day as a collaborator.

Thanks!