Merge pull request #26 from chicagocamps/gh-pages

Update master to match live.