Merge pull request #26 from chicagocamps/gh-pages

Update master to match live.
Merge pull request #27 from chicagocamps/master

Merge pull request #26 from chicagocamps/gh-pages